diff --git a/.classpath b/.classpath index bb13dba0..84b01679 100644 --- a/.classpath +++ b/.classpath @@ -3,8 +3,17 @@ - + + + + + + + + + + diff --git a/.project b/.project index c9ff485b..766e275f 100644 --- a/.project +++ b/.project @@ -37,5 +37,6 @@ org.eclipse.wst.common.project.facet.core.nature org.eclipse.jdt.core.javanature org.eclipse.wst.jsdt.core.jsNature + com.sysdeo.eclipse.tomcat.tomcatnature diff --git a/WebContent/WEB-INF/config/config.properties b/WebContent/WEB-INF/config/config.properties index ead793d5..65bc7518 100644 --- a/WebContent/WEB-INF/config/config.properties +++ b/WebContent/WEB-INF/config/config.properties @@ -41,11 +41,16 @@ jdbc.minEvictableIdleTimeMillis=300000 # #============================================================================================================== table-suffix=_20152016 -extract-log-localtion=/home/log/ +extract-log-localtion=/home/web_manage/log/ gather-tablespace-name=TS_TTSSS -gather-tablespace-path=1 -gather-table-user-password=1 + +gather-tablespace-path= +gather-table-user-password= kubeMasterUrl=http://192.168.0.110:8080/ + collect-user-name=system collect-password=oracle collect-service-name=orcl + +gfs_control_ip=192.168.0.110 +gfs_control_rootPassWd=root diff --git a/WebContent/WEB-INF/config/log4j-config.xml b/WebContent/WEB-INF/config/log4j-config.xml index fb905a3f..fb39773b 100644 --- a/WebContent/WEB-INF/config/log4j-config.xml +++ b/WebContent/WEB-INF/config/log4j-config.xml @@ -8,17 +8,25 @@ + + + + - + + + + + diff --git a/WebContent/WEB-INF/config/mybatis-applicationConfig.xml b/WebContent/WEB-INF/config/mybatis-applicationConfig.xml index 4bb8e731..b2c5e781 100644 --- a/WebContent/WEB-INF/config/mybatis-applicationConfig.xml +++ b/WebContent/WEB-INF/config/mybatis-applicationConfig.xml @@ -11,6 +11,7 @@ + @@ -18,5 +19,6 @@ + \ No newline at end of file diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 2d425519..304a7726 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -60,7 +60,7 @@ - + \ No newline at end of file diff --git a/src/com/base/BaseController.java b/src/com/base/BaseController.java index 804f833a..395cd09e 100644 --- a/src/com/base/BaseController.java +++ b/src/com/base/BaseController.java @@ -30,7 +30,7 @@ import com.platform.utils.Configs; public class BaseController { /** log4j */ - public static Logger log = Logger.getRootLogger(); + public static Logger log = Configs.DAILY_ROLLING_LOGGER; /** * <一句话功能简述> 基于@ExceptionHandler异常处理----全局异常处理 diff --git a/src/com/base/Custom4exception.java b/src/com/base/Custom4exception.java index 0e109c86..959a5f87 100644 --- a/src/com/base/Custom4exception.java +++ b/src/com/base/Custom4exception.java @@ -29,9 +29,12 @@ public class Custom4exception { /** * 抽取汇总--的-获取抽取动作异常 */ - public final static String threadVolume_Oracle_Except = "3002001002"; + public final static String threadVolume_Oracle_Except = "3002001001"; /** * SQL执行错误 */ public final static String OracleSQL_Except = "3002001002"; + /** * MySQL错误 */ + public final static String MySQL_Except = "3002002003"; + } diff --git a/src/com/base/CustomException.java b/src/com/base/CustomException.java index e40f5697..e59bb6bd 100644 --- a/src/com/base/CustomException.java +++ b/src/com/base/CustomException.java @@ -94,7 +94,7 @@ public class CustomException extends Exception { sbuf.append("\r\n"); // 是否 写入 文件 - log.debug(sbuf.toString()); + log.error(sbuf.toString()); } /** diff --git a/src/com/dao/mapper/VolumeMapper.xml b/src/com/dao/mapper/VolumeMapper.xml new file mode 100644 index 00000000..29f0a59b --- /dev/null +++ b/src/com/dao/mapper/VolumeMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + UPDATE + volume_info + + + + name= #{name}, + + + ip= #{ip}, + + + path= #{path}, + + + mark= #{mark}, + + + + + id = #{id} + + + + + INSERT INTO + volume_info( + + + name, + + + ip, + + + path, + + + mark, + + + ) + VALUES( + + + #{name}, + + + #{ip}, + + + #{path}, + + + #{mark}, + + + ) + + + + DELETE FROM + volume_info + WHERE + name = #{name} + + + \ No newline at end of file diff --git a/src/com/dao/mapper/data-details-mapper.xml b/src/com/dao/mapper/data-details-mapper.xml index 8aa8b58f..f4b79e5d 100644 --- a/src/com/dao/mapper/data-details-mapper.xml +++ b/src/com/dao/mapper/data-details-mapper.xml @@ -76,7 +76,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" - AND CONCAT(regionalism_code,system_code,city_name,district_name,system_name) LIKE CONCAT('%',CONCAT(#{item},'%')) + AND CONCAT(regionalism_code,system_code,city_name,district_name,system_name,data_year) LIKE CONCAT('%',CONCAT(#{item},'%')) @@ -220,10 +220,10 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" #{year}, - #{start_year}, + #{startYear}, - #{end_year}, + #{endYear}, #{volumeIp}, diff --git a/src/com/dao/mapper/dataInfoMoveTmpmapper.xml b/src/com/dao/mapper/dataInfoMoveTmpmapper.xml index e35029a5..6d7b843d 100644 --- a/src/com/dao/mapper/dataInfoMoveTmpmapper.xml +++ b/src/com/dao/mapper/dataInfoMoveTmpmapper.xml @@ -49,7 +49,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" - regionalism_code,system_code,dst_path,lasttime,fkid + regionalism_code,system_code,dst_path,lasttime,fkid,dst_volume_ip,dst_volume_path @@ -120,6 +120,12 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" fkid, + + dst_volume_ip, + + + dst_volume_path, + ) VALUES( @@ -146,7 +152,13 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" #{lastTime}, - #{fkid), + #{fkid}, + + + #{dstVolumeIp}, + + + #{dstVolumePath}, ) @@ -156,7 +168,7 @@ PUBLIC "-//ibatis.apache.org//DTD Mapper 3.0//EN" INSERT INTO move_data_tmp ( ) VALUES - (#{item.regionalismCode,jdbcType=VARCHAR},#{item.systemCode,jdbcType=INTEGER},#{item.dstPath,jdbcType=VARCHAR},#{item.lastTime,jdbcType=VARCHAR},#{item.fkid}) + (#{item.regionalismCode,jdbcType=VARCHAR},#{item.systemCode,jdbcType=INTEGER},#{item.dstPath,jdbcType=VARCHAR},#{item.lastTime,jdbcType=VARCHAR},#{item.fkid},#{item.dstVolumeIp},#{item.dstVolumePath}) diff --git a/src/com/platform/controller/DataModelController.java b/src/com/platform/controller/DataModelController.java index b5c5cf25..528aa89a 100644 --- a/src/com/platform/controller/DataModelController.java +++ b/src/com/platform/controller/DataModelController.java @@ -94,7 +94,7 @@ public class DataModelController extends BaseController { PagerOptions pagerOptions = (PagerOptions) UtilsHelper .newObjAndSetAttrsByClass(PagerOptions.class, params); //冷热区查询字段mark - pagerOptions.setMark(String.valueOf(pagerOptions.getVolumeType())); + pagerOptions.setMark(pagerOptions.getVolumeType()); return dfs.getPagerTableData(pagerOptions); } diff --git a/src/com/platform/controller/VolumeController.java b/src/com/platform/controller/VolumeController.java new file mode 100644 index 00000000..a486e2d8 --- /dev/null +++ b/src/com/platform/controller/VolumeController.java @@ -0,0 +1,53 @@ +package com.platform.controller; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.log4j.Logger; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.base.BaseController; +import com.platform.entities.VolumeEntity; +import com.platform.entities.VolumeForm; +import com.platform.entities.VolumeInitEntity; +import com.platform.service.IVolumeService; +import com.platform.utils.Configs; +import com.platform.utils.ThreadVolume; +import com.platform.utils.ThreadVolumeImm; + +@Controller +public class VolumeController extends BaseController{ + + public static Logger log = Configs.DAILY_ROLLING_LOGGER; + + @Resource(name = "volumeService") + private IVolumeService volumeService; + + + @RequestMapping(value = "/volume/update", method = RequestMethod.POST) + @ResponseBody + public void volumeUpdate(HttpServletRequest res, HttpServletResponse req, + @RequestBody VolumeEntity form) throws Exception { + Configs.CONSOLE_LOGGER.error("/oracle/update"); + volumeService.save(form); + req.setStatus(200); + new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-update").start(); + } + + @RequestMapping(value = "/volume/delete", method = RequestMethod.POST) + @ResponseBody + public void volumeDelete(HttpServletRequest res, HttpServletResponse req, + @RequestBody VolumeEntity entity) throws Exception { + Configs.CONSOLE_LOGGER.error("/oracle/delete"); + volumeService.delete(entity); + req.setStatus(200); + new ThreadVolumeImm("ThreadVolumeImm-in-VolumeController-delete").start(); + } + + +} diff --git a/src/com/platform/dao/VolumeDao.java b/src/com/platform/dao/VolumeDao.java new file mode 100644 index 00000000..1d1d0232 --- /dev/null +++ b/src/com/platform/dao/VolumeDao.java @@ -0,0 +1,27 @@ +package com.platform.dao; + +import java.util.List; + +import org.springframework.stereotype.Repository; + +import com.platform.entities.VolumeInitEntity; + +/** + * @author chen + * 数据迁移状态 临时 存放 ， + */ +@Repository(value = "volumeDao") +public interface VolumeDao { + + /** 查 + * @return + * @throws Exception + */ + List findAll() throws Exception; + + int update(VolumeInitEntity data) throws Exception; + + int save(VolumeInitEntity data) throws Exception; + + int remove(String name) throws Exception; +} diff --git a/src/com/platform/entities/DataInfoEntity.java b/src/com/platform/entities/DataInfoEntity.java index e74dee30..2c227aa6 100644 --- a/src/com/platform/entities/DataInfoEntity.java +++ b/src/com/platform/entities/DataInfoEntity.java @@ -23,7 +23,7 @@ public class DataInfoEntity { private String collectorName; // 采集人姓名 private String year; // 数据年度 - /** 是否抽取 */ + /** 是否抽取 ，0标示为未汇总，1标示汇总中，2标示汇总完成 */ private int extractStatus; /** 数据年度起始 */ private String startYear; @@ -35,7 +35,7 @@ public class DataInfoEntity { /** volume的path */ private String volumePath; - private int volumeType; + private String volumeType; private String mark; @@ -258,14 +258,14 @@ public class DataInfoEntity { /** * @return the volumeType */ - public int getVolumeType() { + public String getVolumeType() { return volumeType; } /** * @param volumeType the volumeType to set */ - public void setVolumeType(int volumeType) { + public void setVolumeType(String volumeType) { this.volumeType = volumeType; } diff --git a/src/com/platform/entities/VolumeEntity.java b/src/com/platform/entities/VolumeEntity.java index ae2604ea..b562e9c1 100644 --- a/src/com/platform/entities/VolumeEntity.java +++ b/src/com/platform/entities/VolumeEntity.java @@ -37,7 +37,7 @@ public class VolumeEntity { private String path; /** * exist，正常返回状态Started,Stopped,Created */ - private String status; + private boolean status; private String type; @@ -103,17 +103,18 @@ public class VolumeEntity { this.path = path; } + /** * @return the status */ - public String getStatus() { + public boolean isStatus() { return status; } /** * @param status the status to set */ - public void setStatus(String status) { + public void setStatus(boolean status) { this.status = status; } @@ -159,4 +160,5 @@ public class VolumeEntity { this.brick = brick; } + } diff --git a/src/com/platform/entities/VolumeForm.java b/src/com/platform/entities/VolumeForm.java new file mode 100644 index 00000000..5baab4fe --- /dev/null +++ b/src/com/platform/entities/VolumeForm.java @@ -0,0 +1,23 @@ +package com.platform.entities; + +import java.util.List; + +public class VolumeForm { + + List volumes; + + /** + * @return the volumes + */ + public List getVolumes() { + return volumes; + } + + /** + * @param volumes the volumes to set + */ + public void setVolumes(List volumes) { + this.volumes = volumes; + } + +} diff --git a/src/com/platform/entities/VolumeInitEntity.java b/src/com/platform/entities/VolumeInitEntity.java new file mode 100644 index 00000000..8f340164 --- /dev/null +++ b/src/com/platform/entities/VolumeInitEntity.java @@ -0,0 +1,104 @@ +package com.platform.entities; + +import java.util.List; + +public class VolumeInitEntity { + + private int id; + + private String name; + + private String ip; + /** 挂载点 */ + private String path; + + private String mark; + + private List bricks; + + + /** + * @return the id + */ + public int getId() { + return id; + } + + /** + * @param id the id to set + */ + public void setId(int id) { + this.id = id; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return the ip + */ + public String getIp() { + return ip; + } + + /** + * @param ip the ip to set + */ + public void setIp(String ip) { + this.ip = ip; + } + + /** + * @return the path + */ + public String getPath() { + return path; + } + + /** + * @param path the path to set + */ + public void setPath(String path) { + this.path = path; + } + + /** + * @return the mark + */ + public String getMark() { + return mark; + } + + /** + * @param mark the mark to set + */ + public void setMark(String mark) { + this.mark = mark; + } + + /** + * @return the bricks + */ + public List getBricks() { + return bricks; + } + + /** + * @param bricks the bricks to set + */ + public void setBricks(List bricks) { + this.bricks = bricks; + } + +} diff --git a/src/com/platform/glusterfs/ClusterInfo.java b/src/com/platform/glusterfs/ClusterInfo.java index 793b86ca..df56469a 100644 --- a/src/com/platform/glusterfs/ClusterInfo.java +++ b/src/com/platform/glusterfs/ClusterInfo.java @@ -5,6 +5,7 @@ package com.platform.glusterfs; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; @@ -16,6 +17,8 @@ import org.apache.log4j.PropertyConfigurator; import com.platform.utils.Constant; +import ch.ethz.ssh2.Connection; + /** * 获取集群信息 * @author liliy @@ -32,12 +35,13 @@ public class ClusterInfo { * 如果ip在集群中且联通状态为PeerinCluster(Connected) * 如果ip在集群中且但不连通为PeerinCluster(Disconnected) * @return + * @throws IOException * @see [类、类#方法、类#成员] */ public Map showClusterInfo() { - log.info("get cluster info"); +// log.info("get cluster info"); Map peerIps = new HashMap(); - + peerIps.put(Constant.hostIp, Constant.peerincluster_connected); List reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(Constant.glusterPeerStatus); if (reStrings == null) { log.error("1101 command get result is null"); @@ -47,9 +51,12 @@ public class ClusterInfo { log.error("1102 command get result is nothing"); return null; } - + + if (reStrings.get(0).contains("No peers present")) { + return peerIps; + } + if (!(reStrings.get(0).split(":")[0].contains("Number of Peers"))) { - log.error("1103 get result string wrong"); return null; } @@ -86,6 +93,28 @@ public class ClusterInfo { } } + +// for (Map.Entry entry:peerIps.entrySet()){ +// String key=entry.getKey(); +// if(key.equals(Constant.hostIp)){ +// continue; +// } +// String value=entry.getValue(); +// if(Constant.ganymedSSH.otherConns==null){ +// Constant.ganymedSSH.otherConns=new HashMap(); +// } +// if(!Constant.ganymedSSH.otherConns.containsKey(key)){ +// Connection connection=null; +// try { +// connection = Constant.ganymedSSH.getOpenedConnection(key, Constant.rootUser, Constant.rootPasswd, Constant.port); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } +// Constant.ganymedSSH.otherConns.put(key,connection); +// } +// } + return peerIps; } diff --git a/src/com/platform/glusterfs/CopyData.java b/src/com/platform/glusterfs/CopyData.java index 0b226c77..d99d6b65 100644 --- a/src/com/platform/glusterfs/CopyData.java +++ b/src/com/platform/glusterfs/CopyData.java @@ -61,7 +61,7 @@ public class CopyData { log.info("3202 "+sourceFolderName+" is not exists"); return -2; } - String command = "cp -r " + sourceFolderName+" "+destFolderName; + String command = "cp -rp " + sourceFolderName+" "+destFolderName; Constant.ganymedSSH.execCmdNoWaitAcquiescent(command); @@ -92,7 +92,7 @@ public class CopyData { log.info("3202 "+sourceFolderName+"/"+fileName+" is not exists"); return -2; } - String command = "cp -r " + sourceFolderName + "/" + fileName+" "+destFolderName; + String command = "cp -rp " + sourceFolderName + "/" + fileName+" "+destFolderName; /* * RunCommand runCommand = new RunCommand(); diff --git a/src/com/platform/glusterfs/SetVolume.java b/src/com/platform/glusterfs/SetVolume.java index 8a361b18..6d9fc1e2 100644 --- a/src/com/platform/glusterfs/SetVolume.java +++ b/src/com/platform/glusterfs/SetVolume.java @@ -280,7 +280,7 @@ public class SetVolume { if (new VolumeInfo().getVolumeStatus(volumeName).equals("Stopped")) { log.error("3502 the volume is already stoped"); System.out.println("3502 the volume is already stoped"); - return -1; + return 0; } else { String command = "echo -e \"y\"| gluster volume stop " + volumeName; List reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command); diff --git a/src/com/platform/glusterfs/SizeInfo.java b/src/com/platform/glusterfs/SizeInfo.java index 4d639be2..03f74228 100644 --- a/src/com/platform/glusterfs/SizeInfo.java +++ b/src/com/platform/glusterfs/SizeInfo.java @@ -23,7 +23,7 @@ public class SizeInfo { * @return */ public long showAllSize() { - log.info("get AllSize "); +// log.info("get AllSize "); List volumeNames = volumeInfo.showAllVolumeName(); if (volumeNames == null) { log.error("1201 showAllVolumeName error"); diff --git a/src/com/platform/glusterfs/VolumeInfo.java b/src/com/platform/glusterfs/VolumeInfo.java index f3583102..f30d5d53 100644 --- a/src/com/platform/glusterfs/VolumeInfo.java +++ b/src/com/platform/glusterfs/VolumeInfo.java @@ -37,7 +37,7 @@ public class VolumeInfo { * @see [类、类#方法、类#成员] */ public List showAllVolumeName() { -// log.info("get volume name"); +// log.info(Constant.ganymedSSH+"get volume name"); List volNames = new ArrayList(); /* @@ -46,6 +46,7 @@ public class VolumeInfo { * runCommand = new RunCommand(); List reStrings = * runCommand.runCommandWait(command); */ + List reStrings = Constant.ganymedSSH .execCmdWaitAcquiescent(Constant.glusterVolumeInfo + "|grep ^Volume.Name"); // System.out.println(reStrings); @@ -176,7 +177,12 @@ public class VolumeInfo { log.error("1801 " + volumeName + " is not exists!"); return -1L; } - allSize = Long.parseLong(reStrings.get(0)); + Pattern pattern2 = Pattern.compile("^\\d+$"); + Matcher matcher2 = pattern2.matcher(reStrings.get(0)); + // 如果是数字 + if (matcher2.find()) { + allSize = Long.parseLong(reStrings.get(0)); + } return allSize; } @@ -207,7 +213,12 @@ public class VolumeInfo { log.error("1902 " + volumeName + " is not exists!"); return -1L; } - usedSize = Long.parseLong(reStrings.get(0)); + Pattern pattern2 = Pattern.compile("^\\d+$"); + Matcher matcher2 = pattern2.matcher(reStrings.get(0)); + // 如果是数字 + if (matcher2.find()) { + usedSize = Long.parseLong(reStrings.get(0)); + } return usedSize; } diff --git a/src/com/platform/oracle/OracleConnector.java b/src/com/platform/oracle/OracleConnector.java index 923d578b..16f9d09a 100644 --- a/src/com/platform/oracle/OracleConnector.java +++ b/src/com/platform/oracle/OracleConnector.java @@ -8,6 +8,7 @@ import java.sql.Statement; import com.base.Custom4exception; import com.base.CustomException; +import com.platform.entities.OracleConnectorParams; import com.platform.utils.Configs; import com.platform.utils.FileOperateHelper; @@ -25,19 +26,23 @@ public class OracleConnector { public synchronized static Connection ConnectionBuilder(String url, String user, - String password) { + String password, OracleConnectorParams oc) { Connection conn=null; try { conn = DriverManager.getConnection(url, user, password); } catch (SQLException e) { new CustomException(Custom4exception.OracleSQL_Except, e); Configs.CONSOLE_LOGGER.info("创建oracle连接失败: [" + e.getMessage() + "]"); + if (null != oc) { + FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION + + oc.getName(), "创建oracle连接失败: [" + e.getMessage() + "]\r\n"); + } } return conn; } public synchronized static boolean canConnect(String url, String user, String password) { - return (null != ConnectionBuilder(url, user, password)); + return (null != ConnectionBuilder(url, user, password, null)); } public synchronized static ResultSet getSQLExecResultSet(Connection conn, String sql, String filePath) { @@ -60,7 +65,7 @@ public class OracleConnector { public synchronized static ResultSet getSQLExecResultSet(String url, String user, String password, String sql, String filePath) { - return getSQLExecResultSet(ConnectionBuilder(url, user, password), sql, filePath); + return getSQLExecResultSet(ConnectionBuilder(url, user, password, null), sql, filePath); } /** diff --git a/src/com/platform/service/DataInfoServiceImp.java b/src/com/platform/service/DataInfoServiceImp.java index 47db7781..b6613af1 100644 --- a/src/com/platform/service/DataInfoServiceImp.java +++ b/src/com/platform/service/DataInfoServiceImp.java @@ -1,24 +1,37 @@ package com.platform.service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.annotation.Resource; +import org.apache.log4j.Logger; import org.springframework.stereotype.Service; import org.springframework.ui.ModelMap; +import com.base.Custom4exception; import com.base.CustomException; import com.platform.dao.DataInfoDao; import com.platform.entities.DataInfoEntity; import com.platform.entities.PagerOptions; +import com.platform.glusterfs.RemoveData; import com.platform.utils.Bean2MapUtils; +import com.platform.utils.Configs; @Service(value = "dataInfoService") public class DataInfoServiceImp implements DataInfoService { + + /** log4j */ + public static Logger log = Configs.DAILY_ROLLING_LOGGER; + @Resource(name = "dataInfoDao") private DataInfoDao dfdDao; + + private RemoveData removedata = new RemoveData(); public void setDfdDao(DataInfoDao dfdDao) { this.dfdDao = dfdDao; @@ -30,25 +43,56 @@ public class DataInfoServiceImp implements DataInfoService { String querystr = pagerOptions.getKeyQuery(); String[] querys = null; try { + List removelist = new ArrayList(); + List alllist = new ArrayList(); + List list = new ArrayList(); + //去掉版本字段 + Pattern pattern = Pattern.compile("^版本\\d+$"); if (null != querystr && !"".equals(querystr)) { querys = querystr.split(" "); + list = Arrays.asList(querys); + } + //遍历 list + for (String ss : alllist) { + ss = ss.trim(); + alllist.add(ss); + } + for (String ss : alllist) { + Matcher matcher2 = pattern.matcher(ss); + // 去掉 最后 的 / 符合 + if (matcher2.find()) { + String s2 = matcher2.group(); + removelist.add(ss); + } + } + alllist.removeAll(removelist); + Object[] strs = alllist.toArray(); + int length = strs.length; + String[] arrays = new String[length]; + for (int i = 0; i < length; i++) { + arrays[i] = strs[i].toString(); + } + for (String version : removelist) { + pagerOptions.setDataVersion(Integer.valueOf(version.replace("版本", ""))); + } + if (arrays.length > 0) { + pagerOptions.setArray(arrays); } - pagerOptions.setArray(querys); int count = dfdDao.getLimitedDataCount(pagerOptions); //获取总记录条数 - System.out.println("total colume " + count); + log.info("total colume " + count); int offset = 0; if (pagerOptions.getCurrentPageNum() > 1) { pagerOptions.setTotalLimit((pagerOptions.getCurrentPageNum() - 1) * pagerOptions.getPriorTableSize()); offset = dfdDao.getLimitedBeginId(pagerOptions); //获取起始查询id - System.out.println(offset); + log.info(offset); } pagerOptions.setOffset(offset + 1); List result = dfdDao .getLimitedDataInfoEntities(pagerOptions); if (null != result) { for (DataInfoEntity dataInfoEntity : result) { - dataInfoEntity.setVolumeType(Integer.valueOf(dataInfoEntity.getMark())); + dataInfoEntity.setVolumeType(dataInfoEntity.getMark()); } } modelMap.addAttribute("data", result); @@ -70,9 +114,24 @@ public class DataInfoServiceImp implements DataInfoService { //数据在不在？ List paths = dfdDao.getIdIsExist(ids); if(paths.size()>0){ - //删除文件操作 + //TODO 删除文件操作 + Pattern pattern = Pattern + .compile("\\/$"); for (int i = 0; i < paths.size(); i++) { - System.out.println(paths.get(i)); + String folderPath = paths.get(i); + Matcher matcher = pattern.matcher(folderPath); + String tailPath = ""; + if (matcher.find()) { + tailPath = matcher.group(); + } + folderPath = folderPath.substring(0, folderPath.length()-tailPath.length()); + int res = removedata.deleteFolder(folderPath); + if (res != 1) { + log.error( folderPath+ " 删除失败！\n"); + } + else { + log.info( folderPath+ " 删除成功！\n"); + } } //删除数据库记录 dfdDao.removes(ids); @@ -86,8 +145,8 @@ public class DataInfoServiceImp implements DataInfoService { try { result = dfdDao.save(data); } catch (Exception e) { - // TODO: handle exception - System.out.println(""); + result = -1; + new CustomException(Custom4exception.MySQL_Except, e, data); } return result; } diff --git a/src/com/platform/service/IVolumeService.java b/src/com/platform/service/IVolumeService.java new file mode 100644 index 00000000..653bded8 --- /dev/null +++ b/src/com/platform/service/IVolumeService.java @@ -0,0 +1,16 @@ +package com.platform.service; + +import com.platform.entities.VolumeEntity; +import com.platform.entities.VolumeInitEntity; + +public interface IVolumeService { + + public int save(VolumeEntity entity) throws Exception; + + public int delete(VolumeEntity entity) throws Exception; + + public int start(VolumeEntity entity) throws Exception; + + public int stop(VolumeEntity entity) throws Exception; + +} diff --git a/src/com/platform/service/OracleExtractHelper.java b/src/com/platform/service/OracleExtractHelper.java index 26d5643d..d2e688a9 100644 --- a/src/com/platform/service/OracleExtractHelper.java +++ b/src/com/platform/service/OracleExtractHelper.java @@ -35,7 +35,7 @@ public class OracleExtractHelper { .fileWrite(filePath, sql+ "\r\n"+"OK \r\n"); } catch (Exception e) { FileOperateHelper - .fileWrite(filePath, sql+ "\r\n"+ e.getMessage() + " \r\n"); + .fileWrite(filePath, sql+ "\r\n"+ e.getMessage() + "\r\n，连接异常！ \r\n"); new CustomException(Custom4exception.threadVolume_Oracle_Except, e, rSet); } return flag; diff --git a/src/com/platform/service/OracleExtractService.java b/src/com/platform/service/OracleExtractService.java index 1b23ed7c..23df97ce 100644 --- a/src/com/platform/service/OracleExtractService.java +++ b/src/com/platform/service/OracleExtractService.java @@ -13,7 +13,7 @@ public class OracleExtractService extends Thread implements Runnable { public OracleExtractService(OracleConnectorParams ocp){ this.ocp=ocp; String url = ""; - this.conn=OracleConnector.ConnectionBuilder(url, Configs.GATHER_USER_NAME, Configs.GATHER_USER_PASSWORD); + this.conn=OracleConnector.ConnectionBuilder(url, Configs.GATHER_USER_NAME, Configs.GATHER_USER_PASSWORD, null); } @Override public void run() { diff --git a/src/com/platform/service/impl/MoveDataServiceImpl.java b/src/com/platform/service/impl/MoveDataServiceImpl.java index 7adb04dd..b3aca0e8 100644 --- a/src/com/platform/service/impl/MoveDataServiceImpl.java +++ b/src/com/platform/service/impl/MoveDataServiceImpl.java @@ -14,9 +14,11 @@ import org.springframework.stereotype.Service; import com.platform.dao.DataInfoDao; import com.platform.dao.DataInfoMoveTmpDao; +import com.platform.dao.VolumeDao; import com.platform.entities.DataInfoEntity; import com.platform.entities.DataInfoEntityMoveTmp; import com.platform.entities.FolderNode; +import com.platform.entities.VolumeInitEntity; import com.platform.glusterfs.CheckoutMD5; import com.platform.glusterfs.CopyData; import com.platform.glusterfs.RemoveData; @@ -32,6 +34,9 @@ public class MoveDataServiceImpl implements IMoveDataService { @Resource(name = "dataInfoDao") private DataInfoDao dataInfoDao; + + @Resource(name = "volumeDao") + private VolumeDao volumeDao; private RemoveData removeservice = new RemoveData(); @@ -63,12 +68,17 @@ public class MoveDataServiceImpl implements IMoveDataService { if (null ==node.getPath() ||"".equals(node.getPath())) { return false; } + List listVolume = volumeDao.findAll(); + if (null == listVolume || listVolume.size() == 0) { + return false; + } String tailPath = ""; if (null != data) { // XXX/320198_16/1,or XXX/320122KFQ_15/1 ---> /320198_16/1, or // /320122KFQ_15/1 List exist = dataInfoMoveTmpDao.findAll(); List existIds = new ArrayList(); + List fkIds = new ArrayList(); if (null != exist) { for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp : exist) { if ("0".equals(dataInfoEntityMoveTmp.getCompleteStatus()) @@ -77,6 +87,7 @@ public class MoveDataServiceImpl implements IMoveDataService { if (null != dataInfoEntityMoveTmp.getDataPath()) { existIds.add(dataInfoEntityMoveTmp.getDataPath()); } + fkIds.add(dataInfoEntityMoveTmp.getFkid()); } } } @@ -95,6 +106,12 @@ public class MoveDataServiceImpl implements IMoveDataService { if (existIds.contains(dataInfoEntity.getDataPath())) { continue; } + if (dataInfoEntity.getId() == 0) { + continue; + } + if (fkIds.contains(dataInfoEntity.getId())) { + continue; + } // TODO 正则：取出 data 的后面 的 路径，eg: XXX/320198_16/1,or // XXX/320122KFQ_15/1） Matcher matcher = pattern.matcher(dataInfoEntity.getDataPath()); @@ -114,11 +131,30 @@ public class MoveDataServiceImpl implements IMoveDataService { dataMove.setDstPath(finalDestPath); dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); dataMove.setFkid(dataInfoEntity.getId()); - dataMove.setVolumePath(node.getName()); + // 末尾 含有 / + Matcher matcher3 = pattern2.matcher(node.getPath()); + // 去掉 最后 的 / 符合 + String volumePath = ""; + if (!matcher3.find()) { + volumePath = node.getPath()+"/"; + } + else { + volumePath = node.getPath(); + } + for ( VolumeInitEntity ve : listVolume) { + if (volumePath.contains(ve.getPath())) { + dataMove.setDstVolumePath(ve.getPath()); + dataMove.setDstVolumeIp(ve.getIp()); + break; + } + } moveList.add(dataMove); } if (moveList.size() > 0) { dataInfoMoveTmpDao.insertBatch(moveList); +// for (DataInfoEntityMoveTmp dataInfoEntityMoveTmp2 : moveList) { +// dataInfoMoveTmpDao.save(dataInfoEntityMoveTmp2); +// } isSuccess = true; } } diff --git a/src/com/platform/service/impl/MySqlServiceImpl.java b/src/com/platform/service/impl/MySqlServiceImpl.java index 7efaa3f8..5f3d1a44 100644 --- a/src/com/platform/service/impl/MySqlServiceImpl.java +++ b/src/com/platform/service/impl/MySqlServiceImpl.java @@ -1,5 +1,6 @@ package com.platform.service.impl; +import java.sql.Connection; import java.util.List; import javax.annotation.Resource; @@ -8,6 +9,7 @@ import org.springframework.stereotype.Service; import com.platform.dao.GatherOracleDao; import com.platform.entities.GatherOracleInfo; +import com.platform.oracle.OracleConnector; import com.platform.service.IMySqlService; @Service(value = "mySqlService") @@ -37,12 +39,20 @@ public class MySqlServiceImpl implements IMySqlService{ } public int insertOracle(GatherOracleInfo oracle) throws Exception { + //TODO 连接oracle， int result = gatherOracleDao.insertOracle(oracle); return result; } @Override public int updateOracle(GatherOracleInfo oracle) throws Exception { + int status = 1; + Connection conn = null /*OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracle.getIp() + ":" + oracle.getPort() + ":" + + oracle.getDatabaseName(), oracle.getUser(), oracle.getPassword())*/; + if (null == conn) { + status = 0; + } + oracle.setStatus(status); int result; if (oracle.getId() > 0) { result = gatherOracleDao.updateOracleById(oracle); diff --git a/src/com/platform/service/impl/OracleExtractServiceImpl.java b/src/com/platform/service/impl/OracleExtractServiceImpl.java index 908dc4c9..a53bef9b 100644 --- a/src/com/platform/service/impl/OracleExtractServiceImpl.java +++ b/src/com/platform/service/impl/OracleExtractServiceImpl.java @@ -19,6 +19,7 @@ import com.platform.service.IOracleExtractService; import com.platform.service.OracleExtractHelper; import com.platform.utils.Configs; import com.platform.utils.Constant; +import com.platform.utils.FileOperateHelper; @Service(value = "OracleExtract") public class OracleExtractServiceImpl implements IOracleExtractService { @@ -48,8 +49,16 @@ public class OracleExtractServiceImpl implements IOracleExtractService { GatherOracleInfo oracleModel = oracleConnect; //采集库连接参数 List datainfos = dataInfolist; + if (datainfos.size() == 0) { + return false; + } Connection conn = OracleConnector.ConnectionBuilder("jdbc:oracle:thin:@" + oracleModel.getIp() + ":" + oracleModel.getPort() + ":" - + oracleModel.getDatabaseName(), oracleModel.getUser(), oracleModel.getPassword()); + + oracleModel.getDatabaseName(), oracleModel.getUser(), oracleModel.getPassword(),dataInfolist.get(0)); + if (null == conn) { + FileOperateHelper.fileWrite(Configs.EXTRACT_LOG_LOCALTION + + dataInfolist.get(0).getName(), "创建oracle连接失败: [" + conn + "]\r\n"); + return false; + } for (OracleConnectorParams collectOracle : datainfos) { if(null != collectOracle.getDataId() && !"".equals(collectOracle.getDataId())){ diff --git a/src/com/platform/service/impl/VolumeServiceImpl.java b/src/com/platform/service/impl/VolumeServiceImpl.java new file mode 100644 index 00000000..1884d8c9 --- /dev/null +++ b/src/com/platform/service/impl/VolumeServiceImpl.java @@ -0,0 +1,166 @@ +package com.platform.service.impl; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +import com.platform.dao.VolumeDao; +import com.platform.entities.Brick; +import com.platform.entities.VolumeEntity; +import com.platform.entities.VolumeInitEntity; +import com.platform.glusterfs.SetVolume; +import com.platform.service.IGfsService; +import com.platform.service.IVolumeService; + +@Service(value = "volumeService") +public class VolumeServiceImpl implements IVolumeService { + + /** gfs的api */ + SetVolume volumeService = new SetVolume(); + + @Resource(name = "gfsService") + private IGfsService gfsService; + + @Resource(name = "volumeDao") + private VolumeDao volumeDao; + + + @Override + public int save(VolumeEntity entity) throws Exception { + //createVolume("lili_test1", 0, "distributed", bricksToCreate, "/home/lili_test1_point") + List result = gfsService.getAllVolumes(); + List addVolumes = new ArrayList(); + VolumeEntity volumeTmp = null; + if (null != result) { + boolean isExits = false; + //.trim() 去掉空格 + for (VolumeEntity volumeOnServer : result) { + if(entity.getName().trim().equals(volumeOnServer.getName().trim())){ + isExits = true; + //TODO 服务器上有该volume， + volumeTmp = volumeOnServer; + break; + } + } + //如果服务器上没有该volume， + if (!isExits) { + addVolumes.add(entity); + } + + } + boolean isContinue = true; + // 对比volume信息--原数据没有该volume，则新增volume: + for (VolumeEntity add : addVolumes) { + List bristr = new ArrayList(); + if (null == add.getName() || "".equals(add.getName())) { + continue; + } + if (null == add.getPath() || "".equals(add.getPath())) { + continue; + } + for ( Brick bri : add.getBrick()) { + if (null == bri.getIp() || "".equals(bri.getIp())) { + continue; + } + if (null == bri.getPath() || "".equals(bri.getPath())) { + continue; + } + bristr.add(bri.getIp()+":"+bri.getPath()); + }; + + //创建volume + if (bristr.size() > 0) { + volumeService.createVolume(add.getName(), 0, "distributed", bristr, add.getPath()); + } + //记录volume信息， + VolumeInitEntity volInSql = new VolumeInitEntity(); + volInSql.setName(add.getName()); + volInSql.setPath(add.getPath()); + volumeDao.save(volInSql); + isContinue = false; + } + // 修改 brick + if (isContinue && null != volumeTmp) { + List newBricks = entity.getBrick(); + List serverBricks = volumeTmp.getBrick(); + Map newMap = new HashMap(); + Map serverMap = new HashMap(); + for (Brick brick : newBricks) { + //IP + path 才 确认唯一的 brick + newMap.put(brick.getIp().trim() + ":" + brick.getPath().trim(), null); + } + for (Brick brick : serverBricks) { + serverMap.put(brick.getIp().trim() + ":" + brick.getPath().trim(), null); + } + // ----对比volume信息--原数据有该volume，则对比brick信息，确认那几个brick是新增的，那几个brick是待删除的----start + Set newBrickKeys = newMap.keySet(); + Set serverBrickKeys = serverMap.keySet(); + //新增的Brick的 Keys + List newKeys = new ArrayList(); + newBrickKeys.removeAll(serverBrickKeys); + newKeys.addAll(newBrickKeys); + // 新增brick s， + if (newKeys.size() > 0) { + volumeService.addBrickVolume(entity.getName(), newKeys, 0, "distributed"); + } + //待删除的Brick的 Keys + for (Brick brick : newBricks) { + //IP + path 才 确认唯一的 brick + newMap.put(brick.getIp().trim() + ":" + brick.getPath().trim(), null); + } + newBrickKeys = newMap.keySet(); + serverBrickKeys.removeAll(newBrickKeys); + List deleteKeys = new ArrayList(); + deleteKeys.addAll(serverBrickKeys); + // 删除brick s， + if (deleteKeys.size() > 0) { + volumeService.deleteBrickVolume(entity.getName(), deleteKeys, 0, "distributed"); + } + // ---对比volume信息--原数据有该volume，则对比brick信息，确认那几个brick是新增的，那几个brick是待删除的----- end + + //TODO 查看状态 状态Started,Stopped,Created + if (volumeTmp.isStatus() != entity.isStatus()) { + if (entity.isStatus()) { + this.start(entity); + } + else{ + this.stop(entity); + } + } + } + return 0; + } + + @Override + public int delete(VolumeEntity entity) throws Exception { + if (null == entity.getName() || "".equals(entity.getName())) { + return -1; + } + volumeService.deleteVolume(entity.getName()); + volumeDao.remove(entity.getName()); + return 0; + } + + @Override + public int start(VolumeEntity entity) throws Exception { + if (null == entity.getName() || "".equals(entity.getName())) { + return -1; + } + return volumeService.startVolume(entity.getName()); + } + + @Override + public int stop(VolumeEntity entity) throws Exception { + if (null == entity.getName() || "".equals(entity.getName())) { + return -1; + } + return volumeService.stopVolume(entity.getName()); + } + +} diff --git a/src/com/platform/service/thread/ThreadMoveData.java b/src/com/platform/service/thread/ThreadMoveData.java index a178ff0a..569a62b0 100644 --- a/src/com/platform/service/thread/ThreadMoveData.java +++ b/src/com/platform/service/thread/ThreadMoveData.java @@ -101,12 +101,20 @@ public class ThreadMoveData{ srcSizeTemp = show.getFolderSize(dataMove.getDataPath()); long srcSize = (long) (srcSizeTemp * 0.998); dstSize = show.getFolderSize(dataMove.getDstPath()); + boolean isExist = false; if (srcSize < 0) { log.error(dataMove.getDataPath() + " : 路径不存在！ "); - continue; + isExist = true; } if (dstSize < 0) { log.error(dataMove.getDstPath() + " : 路径不存在！ "); + isExist = true; + } + if (isExist) { + // 3:表示 迁移失败 + dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); + dataMove.setCompleteStatus("3"); + dataInfoMoveTmpDao.update(dataMove); continue; } if (srcSize > 0 && dstSize > 0) { @@ -138,11 +146,13 @@ public class ThreadMoveData{ data.setDataPath(dataMove.getDstPath()); data.setVolumeIp(dataMove.getDstVolumeIp()); data.setVolumePath(dataMove.getDstVolumePath()); - data.setYear(DateForm.date2StringByMin(new Date())); + data.setVolumeIp(dataMove.getVolumeIp()); + data.setId(0); dataInfoDao.save(data); } else { // 3:表示 迁移失败 + dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); dataMove.setCompleteStatus("3"); } } diff --git a/src/com/platform/utils/CacheTreeData.java b/src/com/platform/utils/CacheTreeData.java index 742df9a2..18bde5ce 100644 --- a/src/com/platform/utils/CacheTreeData.java +++ b/src/com/platform/utils/CacheTreeData.java @@ -16,7 +16,7 @@ public class CacheTreeData { return folders; } - public static void setFolders(List folders) { + public synchronized static void setFolders(List folders) { CacheTreeData.folders = folders; } @@ -30,7 +30,7 @@ public class CacheTreeData { /** * @param volumeList the volumeList to set */ - public static void setVolumeList(List volumeList) { + public synchronized static void setVolumeList(List volumeList) { CacheTreeData.volumeList = volumeList; } diff --git a/src/com/platform/utils/ConfigsLoader.java b/src/com/platform/utils/ConfigsLoader.java index 56745ce0..342f493d 100644 --- a/src/com/platform/utils/ConfigsLoader.java +++ b/src/com/platform/utils/ConfigsLoader.java @@ -1,10 +1,13 @@ package com.platform.utils; +import java.util.HashMap; import java.util.Properties; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; +import ch.ethz.ssh2.Connection; + public class ConfigsLoader implements ServletContextListener { private static ConfigPropertyReader cReader = null; @@ -23,7 +26,7 @@ public class ConfigsLoader implements ServletContextListener { + "WEB-INF/config/config.properties"; this.cReader = ConfigPropertyReader.Builder(contextPath); init(); - new ThreadVolume("").start(); + new ThreadVolume("ThreadVolume-in-ConfigsLoader").start(); } public static void init() { @@ -60,6 +63,12 @@ public class ConfigsLoader implements ServletContextListener { .getProperty("gather-tablespace-path"); Configs.GATHER_TABLE_PASSWORD=properties.getProperty("gather-table-user-password"); + + + Constant.hostIp=properties.getProperty("gfs_control_ip").trim(); + Constant.rootPasswd=properties.getProperty("gfs_control_rootPassWd").trim(); + Constant.ganymedSSH = new GanymedSSH(Constant.hostIp, Constant.rootUser, Constant.rootPasswd, Constant.port); + } public ConfigPropertyReader getcReader() { diff --git a/src/com/platform/utils/Constant.java b/src/com/platform/utils/Constant.java index d0eb303b..1f283d67 100644 --- a/src/com/platform/utils/Constant.java +++ b/src/com/platform/utils/Constant.java @@ -1,49 +1,50 @@ - -package com.platform.utils; - - -public class Constant { - public static String rootUser = "root"; - public static String rootPasswd = "root"; - public static String hostIp = "192.168.0.110"; - // public static String hostIp = "192.168.1.105"; - public static int port = 22; - public static String glusterPeerStatus = "gluster peer status"; - public static String glusterVolumeInfo = "gluster volume info "; - public static String df = "df -k "; - public static String peerincluster_connected = "PeerinCluster(Connected)"; - public static String peerincluster_disconnected = "PeerinCluster(Disconnected)"; - public static String peerNotinCluster = "PeerNotinCluster"; - public static String distributed = "distributed"; - public static String replica = "replica"; - public static String stripe = "stripe"; - public static String noVolume = "No volumes present"; - public static String success = "success"; - public static String failed = "failed"; - public static String noSuchFile = "No such file or directory"; - public static GanymedSSH ganymedSSH = new GanymedSSH(hostIp, rootUser, rootPasswd, port); - public static String fileGetTreeData = "WebContent\\WEB-INF\\config\\getTreedata.sh"; - public static String AutoMountfile="/gfsAutoMount/AutoRun.sh"; - public static String MountRecord="/gfsAutoMount/mountPoint.record"; - public static String strGetTreeData = "function ergodic(){\n " - + "for file in \\`ls \\$1\\`\n do\n if [ \"\\$file\" != \"app\" -a -d \\$1\\\"/\\\"\\$file ]\n " - + "then\n ergodic \\$1\"/\"\\$file\n else\n local path=\\$1\"/\"\\$file\n " - + "echo \\$path \n fi\n done\n}\n\nIFS=\\$\\'\\n\\' " - + "#这个必须要，否则会在文件名中有空格时出错\nINIT_PATH=\".\";\nergodic \\$1\n"; - - /** - * volume 获取的线程休眠时间 - */ - public final static int moveFileMaxNum = 1; - - /** - * volume 获取的线程休眠时间 - */ - public final static int get_volume_sleep_time = 600000; - - /** - * volume 获取的线程休眠时间 - */ - public final static int update_dataInfo_sleep_time = 30000; - -} + +package com.platform.utils; + +import java.util.HashMap; + +public class Constant { + public static String rootUser = "root"; + public static String rootPasswd = "root"; +// public static String hostIp = "192.168.191.23"; + public static String hostIp = ""; + public static int port = 22; + public static String glusterPeerStatus = "gluster peer status"; + public static String glusterVolumeInfo = "gluster volume info "; + public static String df = "df -k "; + public static String peerincluster_connected = "PeerinCluster(Connected)"; + public static String peerincluster_disconnected = "PeerinCluster(Disconnected)"; + public static String peerNotinCluster = "PeerNotinCluster"; + public static String distributed = "distributed"; + public static String replica = "replica"; + public static String stripe = "stripe"; + public static String noVolume = "No volumes present"; + public static String success = "success"; + public static String failed = "failed"; + public static String noSuchFile = "No such file or directory"; + public static GanymedSSH ganymedSSH = null; + public static String fileGetTreeData = "WebContent\\WEB-INF\\config\\getTreedata.sh"; + public static String AutoMountfile="/gfsAutoMount/AutoRun.sh"; + public static String MountRecord="/gfsAutoMount/mountPoint.record"; + public static String strGetTreeData = "function ergodic(){\n " + + "for file in \\`ls \\$1\\`\n do\n if [ \"\\$file\" != \"app\" -a -d \\$1\\\"/\\\"\\$file ]\n " + + "then\n ergodic \\$1\"/\"\\$file\n else\n local path=\\$1\"/\"\\$file\n " + + "echo \\$path \n fi\n done\n}\n\nIFS=\\$\\'\\n\\' " + + "#这个必须要，否则会在文件名中有空格时出错\nINIT_PATH=\".\";\nergodic \\$1\n"; + + /** + * volume 获取的线程休眠时间 + */ + public final static int moveFileMaxNum = 1; + + /** + * volume 获取的线程休眠时间 + */ + public final static int get_volume_sleep_time = 10000; + + /** + * volume 获取的线程休眠时间 + */ + public final static int update_dataInfo_sleep_time = 1500; + +} diff --git a/src/com/platform/utils/GanymedSSH.java b/src/com/platform/utils/GanymedSSH.java index 194be049..611f4e5e 100644 --- a/src/com/platform/utils/GanymedSSH.java +++ b/src/com/platform/utils/GanymedSSH.java @@ -23,8 +23,8 @@ import ch.ethz.ssh2.*; public class GanymedSSH { public static Logger log = Logger.getLogger(GanymedSSH.class); - Connection conn; - + Connection conn; + public Map otherConns; public boolean status = true;// 锟角凤拷锟斤拷锟街达拷锟斤拷锟斤拷锟阶刺� public GanymedSSH() { @@ -36,6 +36,7 @@ public class GanymedSSH { // TODO Auto-generated constructor stub try { conn = getOpenedConnection(host, username, password, port); + otherConns=new HashMap(); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -44,22 +45,22 @@ public class GanymedSSH { } - public Connection getOpenedConnection(String host, String username, String password, int port) + public static Connection getOpenedConnection(String host, String username, String password, int port) throws IOException { - conn = new Connection(host, port); - conn.connect(); // make sure the connection is opened - boolean isAuthenticated = conn.authenticateWithPassword(username, password); + Connection conns = new Connection(host, port); + conns.connect(); // make sure the connection is opened + boolean isAuthenticated = conns.authenticateWithPassword(username, password); if (isAuthenticated == false) throw new IOException("Authentication failed."); - return conn; + return conns; } public void execCmdNoWaitAcquiescent(String cmd) { - String host=Constant.hostIp; - String username=Constant.rootUser; - String password=Constant.rootPasswd; - int port=Constant.port; +// String host=Constant.hostIp; +// String username=Constant.rootUser; +// String password=Constant.rootPasswd; +// int port=Constant.port; Session sess = null; try { @@ -79,9 +80,19 @@ public class GanymedSSH { public void execCmdNoWait(String host, String username, String password, int port, String cmd) { Session sess = null; + Connection new_conn; try { - conn = getOpenedConnection(host, username, password, port); - sess = conn.openSession(); + if(Constant.hostIp.equals(host)){ + new_conn=conn; + } + else if(otherConns.containsKey(host) && otherConns.get(host)!=null){ + new_conn=otherConns.get(host); + } + else{ + new_conn = getOpenedConnection(host, username, password, port); + otherConns.put(host, new_conn); + } + sess = new_conn.openSession(); // 执锟斤拷cmd sess.execCommand(cmd); } catch (IOException e) { @@ -94,15 +105,15 @@ public class GanymedSSH { } public List execCmdWaitAcquiescent(String cmd) { - String host=Constant.hostIp; - String username=Constant.rootUser; - String password=Constant.rootPasswd; - int port=Constant.port; +// String host=Constant.hostIp; +// String username=Constant.rootUser; +// String password=Constant.rootPasswd; +// int port=Constant.port; List reStrings = new ArrayList(); Session sess = null; try { - +// conn = getOpenedConnection(host, username, password, port); sess = conn.openSession(); // 执锟斤拷cmd sess.execCommand(cmd); @@ -112,7 +123,7 @@ public class GanymedSSH { BufferedReader stdoutReader = new BufferedReader(new InputStreamReader(stdout)); BufferedReader stderrReader = new BufferedReader(new InputStreamReader(stderr)); while (true) { - String line = stderrReader.readLine(); + String line = stdoutReader.readLine(); if (line != null) { // System.out.println(line); @@ -124,7 +135,7 @@ public class GanymedSSH { if(reStrings.size()==0){ while (true) { - String line = stdoutReader.readLine(); + String line = stderrReader.readLine(); if (line != null) { // System.out.println(line); @@ -138,7 +149,9 @@ public class GanymedSSH { // TODO Auto-generated catch block e.printStackTrace(); } finally { - sess.close(); + if (null != sess) { + sess.close(); + } } return reStrings; @@ -148,9 +161,19 @@ public class GanymedSSH { List reStrings = new ArrayList(); Session sess = null; + Connection new_conn; try { - - sess = conn.openSession(); + if(Constant.hostIp.equals(host)){ + new_conn=conn; + } + else if(otherConns.containsKey(host) && otherConns.get(host)!=null){ + new_conn=otherConns.get(host); + } + else{ + new_conn = getOpenedConnection(host, username, password, port); + otherConns.put(host, new_conn); + } + sess = new_conn.openSession(); // 执锟斤拷cmd sess.execCommand(cmd); diff --git a/src/com/platform/utils/ThreadVolume.java b/src/com/platform/utils/ThreadVolume.java index 03832e9e..9023ad79 100644 --- a/src/com/platform/utils/ThreadVolume.java +++ b/src/com/platform/utils/ThreadVolume.java @@ -15,111 +15,49 @@ import com.platform.glusterfs.ClusterInfo; import com.platform.glusterfs.GetTreeData; import com.platform.glusterfs.VolumeInfo; -public class ThreadVolume extends Thread implements Runnable{ - +public class ThreadVolume extends Thread { + /** * 挂载点路径 -- 暂时无用的 */ private static String pointPath = "/home"; - - /** Volume信息查询 */ + + /** Volume信息查询 */ private VolumeInfo volumeInfo = new VolumeInfo(); - + private ClusterInfo cluster = new ClusterInfo(); - + public ThreadVolume() { // TODO Auto-generated constructor stub } - - public ThreadVolume(String path) { + + public ThreadVolume(String name) { + setName(name); + } + + public ThreadVolume(String name, String path) { if (null != path && !"".equals(path.trim())) { ThreadVolume.pointPath = path; } } - - /** gfs目录树形展示 */ + + /** gfs目录树形展示 */ private GetTreeData gfsTree = new GetTreeData(); - + @Override public void run() { super.run(); - while(true){ - List folderlist = new ArrayList(); - List volumeList = new ArrayList(); - // brick状态 map集合 - Map brickStatusMap = cluster.showClusterInfo(); - - //查询 volume name - List volumeNameList = volumeInfo.showAllVolumeName(); - if (null != volumeNameList) { - for (String volumeName : volumeNameList) { - try { - VolumeEntity volume = new VolumeEntity(); - volume.setName(volumeName); - List path = volumeInfo.getVolumeMountPoint(volumeName); - //默认加载第一个路径 - if (null != path && path.size() > 0) { - volume.setPath(path.get(0)); - } - volume.setAllSize(volumeInfo.getVolumeAvailableSize(volumeName)); - volume.setStatus(volumeInfo.getVolumeStatus(volumeName)); - volume.setUsedSize(volumeInfo.getVolumeUseSize(volumeName)); - volume.setType(volumeInfo.getVolumeType(volumeName)); - //TODO 查询brick-- - //返回 ip:path - List brickStrs = volumeInfo.getVolumeBricks(volumeName); - //brick已用大小： - Map usedSize = volumeInfo.getVolumebricksDataSize(volumeName); - Map availableSize = volumeInfo.getVolumebricksAvailableSize(volumeName); - - List brickList = new ArrayList(); - for (String brickIpPath : brickStrs) { - Brick b = new Brick(); - String ipAndpath[] = brickIpPath.split(":"); - String brickip = ipAndpath[0]; - String brickpath = ipAndpath[1]; - //iP , path , - b.setIp(brickip); - if(brickStatusMap==null || brickStatusMap.size()==0){ - b.setStatus(false); - }else if (brickStatusMap.containsKey(brickip)) { - b.setStatus(true); - } - else { - b.setStatus(false); - } - b.setPath(brickpath); - b.setAvailableSize(availableSize.get(brickIpPath)); - b.setUsedSize(usedSize.get(brickIpPath)); - brickList.add(b); - } - volume.setBrick(brickList); - - - //默认加载第一个路径 - if (null != path && path.size() > 0) { - //装入 folder： - //查询 每个 volume 下的 folder - FolderNode foldertmp = gfsTree.getDatas(path.get(0)); - folderlist.add(foldertmp); - } - volumeList.add(volume); - }catch (Exception e) { - new CustomException(Custom4exception.threadVolume_class_Except,e); - } - } - } - //TODO 更新folder 目录 - CacheTreeData.setFolders(folderlist); - CacheTreeData.setVolumeList(volumeList); - try { - Thread.sleep(Constant.get_volume_sleep_time); - } catch (InterruptedException e) { - new CustomException(Custom4exception.threadVolume_Thread_Except,e); - } - + while (true) { + try { + getVolumeMsg(); + Thread.sleep(Constant.get_volume_sleep_time); + } catch (InterruptedException e) { + new CustomException( + Custom4exception.threadVolume_Thread_Except, e); + } + } - + } public static String getPointPath() { @@ -129,5 +67,93 @@ public class ThreadVolume extends Thread implements Runnable{ public static void setPointPath(String pointPath) { ThreadVolume.pointPath = pointPath; } - + + public void getVolumeMsg() { + List folderlist = new ArrayList(); + List volumeList = new ArrayList(); + // brick状态 map集合 + Map brickStatusMap = cluster.showClusterInfo(); + + // 查询 volume name + List volumeNameList = volumeInfo.showAllVolumeName(); + if (null != volumeNameList) { + for (String volumeName : volumeNameList) { + try { + VolumeEntity volume = new VolumeEntity(); + volume.setName(volumeName); + List path = volumeInfo + .getVolumeMountPoint(volumeName); + // 默认加载第一个路径 + for (String one : path) { + if (!one.contains("df")) { + volume.setPath(one); + } + } + if (null == volume.getPath()) { + volume.setPath(""); + } + volume.setAllSize(volumeInfo + .getVolumeAvailableSize(volumeName) + + volumeInfo.getVolumeUseSize(volumeName)); + // 状态Started,Stopped,Created + String status = volumeInfo.getVolumeStatus(volumeName); + if ("Started".equals(status)) { + volume.setStatus(true); + } else { + volume.setStatus(false); + } + volume.setUsedSize(volumeInfo.getVolumeUseSize(volumeName)); + volume.setType(volumeInfo.getVolumeType(volumeName)); + // TODO 查询brick-- + // 返回 ip:path + List brickStrs = volumeInfo + .getVolumeBricks(volumeName); + // brick已用大小： + Map usedSize = volumeInfo + .getVolumebricksDataSize(volumeName); + Map availableSize = volumeInfo + .getVolumebricksAvailableSize(volumeName); + + List brickList = new ArrayList(); + for (String brickIpPath : brickStrs) { + Brick b = new Brick(); + String ipAndpath[] = brickIpPath.split(":"); + String brickip = ipAndpath[0]; + String brickpath = ipAndpath[1]; + // iP , path , + b.setIp(brickip); + if (brickStatusMap == null + || brickStatusMap.size() == 0) { + b.setStatus(false); + } else if (brickStatusMap.containsKey(brickip)) { + b.setStatus(true); + } else { + b.setStatus(false); + } + b.setPath(brickpath); + b.setAvailableSize(availableSize.get(brickIpPath)); + b.setUsedSize(usedSize.get(brickIpPath)); + brickList.add(b); + } + volume.setBrick(brickList); + + // 默认加载第一个路径 + if (null != path && path.size() > 0) { + // 装入 folder： + // 查询 每个 volume 下的 folder + FolderNode foldertmp = gfsTree.getDatas(path.get(0)); + folderlist.add(foldertmp); + } + volumeList.add(volume); + } catch (Exception e) { + new CustomException( + Custom4exception.threadVolume_class_Except, e); + } + } + } + // 更新folder 目录 + CacheTreeData.setFolders(folderlist); + CacheTreeData.setVolumeList(volumeList); + } + } diff --git a/src/com/platform/utils/ThreadVolumeImm.java b/src/com/platform/utils/ThreadVolumeImm.java new file mode 100644 index 00000000..beaa5613 --- /dev/null +++ b/src/com/platform/utils/ThreadVolumeImm.java @@ -0,0 +1,18 @@ +package com.platform.utils; + +public class ThreadVolumeImm extends Thread{ + + public ThreadVolumeImm() { + // TODO Auto-generated constructor stub + } + + public ThreadVolumeImm(String name) { + setName(name); + } + + @Override + public void run() { + new ThreadVolume().getVolumeMsg(); + } + +}