fix mountPoint

src/com/platform/glusterfs/CopyData.java

@@ -61,24 +61,57 @@ public class CopyData {
 			return -2;
 		}
 		String command = "cp -r " + sourceFolderName + "/" + fileName+" "+destFolderName;
-		/*
-		 * RunCommand runCommand = new RunCommand();
-		 
-		List<String> reStrings = runCommand.runCommandWait(command);
-		*/
+		
 		Constant.ganymedSSH.execCmdNoWaitAcquiescent(command);
 	
 		log.info("copy " + sourceFolderName +"/" + fileName+ " to " + destFolderName + "  running"); 
 		return 1;
 	}
 	
+	/**
+	 * 将sourceFolderName拷贝到destFolderName
+	 * 如果拷贝正常返回1，如果sourceFolderName不存在返回-2 ，如果destFolderName不存在返回-3
+	 * @param sourceFolderName
+	 * @param destFolderName
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	public int copyFolder(String sourceFolderName, String destFolderName) {
+		int progress=0;
+		log.info("start copy "  + sourceFolderName + " to " + destFolderName);
+		ShowData showData=new ShowData();
+		Map<String,String> reStrings=showData.showFolderData(destFolderName);
+		if(reStrings==null){
+			log.info("3201 "+destFolderName+" is not exists");
+			return -3;
+		}
+		
+		reStrings=showData.showFolderData(sourceFolderName);
+		if(reStrings==null){
+			log.info("3202 "+sourceFolderName+" is not exists");
+			return -2;
+		}
+		String command = "cp -r " + sourceFolderName+" "+destFolderName;
+		
+		Constant.ganymedSSH.execCmdNoWaitAcquiescent(command);
+	
+		log.info("copy " + sourceFolderName + " to " + destFolderName + "  running"); 
+		return 1;
+	}
+	/**
+	 * 依次创建不存在文件夹
+	 * <功能详细描述>
+	 * @param folder
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
 	public int createFolders(String folder){
 		log.info("create "+folder);
 		String splitFolder[]=folder.substring(1).split("/");
 		String cmd="mkdir ";
 		for(String one:splitFolder){
 			 cmd+="/"+one.replaceAll(" ", "");
-			 Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+			 List<String> reStrings=Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
 		}
 		return 1;
 	}

src/com/platform/glusterfs/ShowData.java

@@ -55,8 +55,7 @@ public class ShowData {
 		 * RunCommand runCommand=new RunCommand(); List<String>
 		 * reStrings=runCommand.runCommandWait(command);
 		 */
-		List<String> reStrings = Constant.ganymedSSH.execCmdWait(Constant.hostIp, Constant.rootUser,
-				Constant.rootPasswd, Constant.port, command);
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(command);
 		if (reStrings == null) {
 			log.error("2101 command get result is null");
 			return null;

src/com/platform/glusterfs/VolumeInfo.java

@@ -77,7 +77,7 @@ public class VolumeInfo {
 	}
 
 	/**
-	 * 给定参数volume的名称获得volume的类型 <功能详细描述>
+	 * 给定参数volume的名称获得volume的类型 
 	 * 
 	 * @param volumeName
 	 * @return
@@ -257,12 +257,6 @@ public class VolumeInfo {
 			return null;
 		}
 
-//		char flag = reStrings.get(0).trim().toCharArray()[0];
-//		if (flag != '/') {
-//			log.error("11003 get result string wrong");
-//			return null;
-//		}
-
 		for (String mountPoint : reStrings) {
 			mountPoint = mountPoint.replaceAll(" ", "");
 			mountPoints.add(mountPoint);
@@ -274,25 +268,15 @@ public class VolumeInfo {
 		log.info("get one volume MountPoint");
 		
 		String mountPoint=null;
-		String cmd=Constant.df + "|grep " + volumeName + "|awk '{print $6}'";
-		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(cmd);
+		
+		List<String> mountpoints = getVolumeMountPoint(volumeName);
 		// System.out.println(reStrings);
-		if (reStrings == null) {
+		if (mountpoints == null || mountpoints.size() == 0) {
 			log.error("11001 get result string wrong");
 			return null;
 		}
-		if (reStrings.size() == 0) {
-			log.error("11002 " + volumeName + " is not exists or no mountpoint");
-			return null;
-		}
-
-//		char flag = reStrings.get(0).trim().toCharArray()[0];
-//		if (flag != '/') {
-//			log.error("11003 get result string wrong");
-//			return null;
-//		}
 
-		mountPoint=reStrings.get(0);
+		mountPoint=mountpoints.get(0);
 		return mountPoint;
 	}
 
@@ -377,7 +361,7 @@ public class VolumeInfo {
 	}
 
 	/**
-	 * 判断volumeName是否存在，存在返回true，不存在返回false <功能详细描述>
+	 * 判断volumeName是否存在，存在返回true，不存在返回false 
 	 * 
 	 * @param volumeName
 	 * @return

src/com/platform/utils/Constant.java

@@ -23,16 +23,15 @@ public class Constant {
 	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 获取的线程休眠时间
 		 */