add getVolumeBricks

src/com/platform/controller/SetGlusterfsController.java

@@ -13,11 +13,12 @@ package com.platform.controller;
 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.RequestMapping;
 
 /**
- * <一句话功能简述>
+ * 配置集群
  * <功能详细描述>
  * @author    liliy
  * @version   [版本号，2016年9月8日]
@@ -26,20 +27,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
  */
 @Controller
 public class SetGlusterfsController {
-	@RequestMapping("/tes")
+	public static Logger log = Logger.getLogger(SetGlusterfsController.class);
-	public Object defaultHandler(HttpServletRequest req, HttpServletResponse request) {
+	
-		//<2F><><EFBFBD>?ƥ<><C6A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>		
+	@RequestMapping("")
-		try {            
+	public void sf(){
-           
+		
-           System.out.println("fsdfds");
-            
-            return "listAll";
-        } catch (Exception e) {
-            e.printStackTrace();
-            
-            return "result";
-        }
-    
-
 	}
+	
+	
 }

src/com/platform/controller/ShowGlusterfsController.java

@@ -10,16 +10,19 @@
  */
 package com.platform.controller;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.log4j.Logger;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.platform.glusterfs.ClusterInfo;
+import com.platform.glusterfs.VolumeInfo;
 
 /**
- * <一句话功能简述>
+ * 显示集群信息
  * <功能详细描述>
  * @author    liliy
  * @version   [版本号，2016年9月8日]
@@ -28,8 +31,9 @@ import com.platform.glusterfs.ClusterInfo;
  */
 @Controller
 public class ShowGlusterfsController {
+	public static Logger log = Logger.getLogger(ShowGlusterfsController.class);
 	/**
-	 * <一句话功能简述>
+	 * 显示集群节点以及状态
 	 * <功能详细描述>
 	 * @return
 	 * @see [类、类#方法、类#成员]
@@ -40,5 +44,32 @@ public class ShowGlusterfsController {
 		return peer_status;
 	} 
 	
+	/**
+	 * <一句话功能简述>
+	 * <功能详细描述>
+	 * @return
+	 * @see [类、类#方法、类#成员]
+	 */
+	@RequestMapping("/showVolumeStatus")
+	public Map<String,String> showVolumeStatus(){
+		VolumeInfo volumeInfo=new VolumeInfo();
+		Map<String, String> volume_status=new HashMap<String, String>();
+		List<String> volumes=volumeInfo.showAllVolumeName();
+		if(volumes==null){
+			log.error("showAllVolumeName is error!");
+			return null;
+		}
+		for(String vol:volumes){
+			String status=volumeInfo.getVolumeStatus(vol);
+			if(status==null){
+				log.error("getVolumeStatus is error!");
+				return null;
+			}
+			volume_status.put(vol, status);
+		}
+		return volume_status;
+	} 
+	
+	
 	
 }

src/com/platform/glusterfs/GetTreeData.java

@@ -24,6 +24,9 @@ public class GetTreeData {
 		fileOrFolder.children = new ArrayList<FileOrFolder>();
 		for (Map.Entry<String, String> entry : files.entrySet()) {
 			int number = Integer.parseInt(entry.getValue());
+			if(entry.getKey().equals("app")){
+				continue;
+			}
 			if (number == 1) {
 				fileOrFolder.children.add(new FileOrFolder(entry.getKey(), number));
 			}

src/com/platform/glusterfs/VolumeInfo.java

@@ -218,10 +218,35 @@ public class VolumeInfo {
 		return usedSize;
 	}
 
-	public String getVolumeMountPoint(String volumeName) {
+	
+	public List<String> getVolumeMountPoint(String volumeName) {
 		log.info("get volume mountPoint");
 		// String mountPoint = "";
 
+		/*
+		 * =======
+		 * 
+		 * >>>>>>> origin/AlexKie String command = "echo \"" +
+		 * Constant.rootPasswd + "\"  |sudo -S df -h|grep " + volumeName +
+		 * "|awk '{print $6}'"; RunCommand runCommand = new RunCommand();
+		 * List<String> reStrings = runCommand.runCommandWait(command); <<<<<<<
+		 * HEAD
+		 */
+		String cmd="gluster volume info "+volumeName+" |grep ^Brick'[0-9]\\+' |awk '{print $2}'";
+		List<String> reStrings = Constant.ganymedSSH.execCmdWaitAcquiescent(volumeName);
+		// System.out.println(reStrings);
+		if(reStrings==null){
+			log.error("1601 get result string wrong");
+			return null;
+		}
+		
+		return reStrings;
+	}
+
+	public String getVolumeBricks(String volumeName) {
+		log.info("get volume bricks");
+		// String mountPoint = "";
+
 		/*
 		 * =======
 		 * 
@@ -254,7 +279,7 @@ public class VolumeInfo {
 		mountPoint=mountPoint.replaceAll(" ", "");
 		return mountPoint;
 	}
-
+	
 	public static void main(String[] args) {
 		PropertyConfigurator.configure("log4j.properties");
 		

src/com/platform/utils/GanymedSSH.java

@@ -120,7 +120,7 @@ public class GanymedSSH {
 					break;
 				}
 			}
-
+			if(reStrings.size()==0){		
 			while (true) {
 				String line = stderrReader.readLine();
 
@@ -131,6 +131,7 @@ public class GanymedSSH {
 					break;
 				}
 			}
+			}
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -165,7 +166,7 @@ public class GanymedSSH {
 					break;
 				}
 			}
-
+			if(reStrings.size()==0){			
 			while (true) {
 				String line = stderrReader.readLine();
 
@@ -176,6 +177,7 @@ public class GanymedSSH {
 					break;
 				}
 			}
+			}
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();