add reshard status enum

Author: carlosfu

cachecloud-open-web/src/main/java/com/sohu/cache/redis/RedisClusterReshard.java

@@ -1,6 +1,7 @@
 package com.sohu.cache.redis;
 
 import com.sohu.cache.entity.InstanceInfo;
+import com.sohu.cache.redis.ReshardProcess.ReshardStatusEnum;
 import com.sohu.cache.util.IdempotentConfirmer;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -33,7 +34,7 @@ public class RedisClusterReshard {
     /**
      * 每次迁移key个数
      */
-    private int migrateBatch = 100;
+    private int migrateBatch = 10;
 
     /**
      * 所有有效节点
@@ -173,7 +174,7 @@ public boolean migrateSlot(InstanceInfo sourceInstanceInfo, InstanceInfo targetI
         //源和目标Jedis
         Jedis sourceJedis = getJedis(sourceInstanceInfo.getIp(), sourceInstanceInfo.getPort(), defaultTimeout);
         Jedis targetJedis = getJedis(targetInstanceInfo.getIp(), targetInstanceInfo.getPort(), defaultTimeout);
-        //
+        //逐个slot迁移
         boolean hasError = false;
         for (int slot = startSlot; slot <= endSlot; slot++) {
             long slotStartTime = System.currentTimeMillis();
@@ -189,17 +190,17 @@ public boolean migrateSlot(InstanceInfo sourceInstanceInfo, InstanceInfo targetI
                 break;
             }
         }
-        if (reshardProcess.getStatus() != 2) {
-            reshardProcess.setStatus(1);
+        if (reshardProcess.getStatus() != ReshardStatusEnum.ERROR.getValue()) {
+            reshardProcess.setStatus(ReshardStatusEnum.FINISH.getValue());
         }
         long endTime = System.currentTimeMillis();
         logger.warn("clusterReshard:{}->{}, slot:{}->{}, costTime={} ms", sourceInstanceInfo.getHostPort(),
                 targetInstanceInfo.getHostPort(), startSlot, endSlot, (endTime - startTime));
         if (hasError) {
-            reshardProcess.setStatus(2);
+            reshardProcess.setStatus(ReshardStatusEnum.ERROR.getValue());
             return false;
         } else {
-            reshardProcess.setStatus(1);
+            reshardProcess.setStatus(ReshardStatusEnum.FINISH.getValue());
             return true;
         }
     }

cachecloud-open-web/src/main/java/com/sohu/cache/redis/ReshardProcess.java

@@ -4,6 +4,7 @@
 
 import java.util.Arrays;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -44,6 +45,43 @@ public class ReshardProcess {
     private volatile Date beginTime;
 
     private volatile Date endTime;
+    
+    
+    /**
+     * Reshard状态
+     */
+    public static enum ReshardStatusEnum {
+        RUNNING(0, "运行中"), 
+        FINISH(1, "完成"), 
+        ERROR(2, "出错");
+
+        private int value;
+        private String info;
+        
+        private final static Map<Integer, ReshardStatusEnum> MAP = new HashMap<Integer, ReshardStatusEnum>();
+        static {
+            for (ReshardStatusEnum reshardStatusEnum : ReshardStatusEnum.values()) {
+                MAP.put(reshardStatusEnum.getValue(), reshardStatusEnum);
+            }
+        }
+        
+        public static ReshardStatusEnum getReshardStatusEnum(int value) {
+            return MAP.get(value);
+        }
+
+        private ReshardStatusEnum(int value, String info) {
+            this.value = value;
+            this.info = info;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getInfo() {
+            return info;
+        }
+    }
 
     public ReshardProcess() {
         beginTime = new Date();
@@ -72,19 +110,14 @@ public void addReshardSlot(int slot, long moveCount) {
 
     public void setStatus(int status) {
         this.status = status;
-        if (Arrays.asList(1,2).contains(status) && endTime == null) {
+        if (Arrays.asList(ReshardStatusEnum.FINISH.getValue(), ReshardStatusEnum.ERROR.getValue()).contains(status) && endTime == null) {
             endTime = new Date();
         }
     }
 
     public String getStatusDesc() {
-        if (status == 0) {
-            return "运行中";
-        } else if (status == 1) {
-            return "完成";
-        } else {
-            return "出错";
-        }
+        ReshardStatusEnum reshardStatusEnum = ReshardStatusEnum.getReshardStatusEnum(status);
+        return reshardStatusEnum == null ? "" : reshardStatusEnum.getInfo();
     }
 
     public void setReshardSlot(int reshardSlot) {

cachecloud-open-web/src/main/java/com/sohu/cache/web/controller/AppManageController.java

@@ -194,7 +194,7 @@ public ModelAndView doInitHorizontalScaleApply(HttpServletRequest request, HttpS
 
 
     /**
-     * 添加分片
+     * 添加水平扩容节点
      * 
      * @return
      */
@@ -207,7 +207,7 @@ public ModelAndView doAddHorizontalNodes(HttpServletRequest request,
         boolean isAdd = false;
         AppAudit appAudit = appService.getAppAuditById(appAuditId);
         // 解析配置
-        String[] configArr = masterSizeSlave.split(":");
+        String[] configArr = masterSizeSlave.split(ConstUtils.COLON);
         String masterHost = configArr[0];
         String memSize = configArr[1];
         int memSizeInt = NumberUtils.toInt(memSize);
@@ -226,7 +226,7 @@ public ModelAndView doAddHorizontalNodes(HttpServletRequest request,
     }
 
     /**
-     * 检测
+     * 检测水平扩容节点
      * @param masterSizeSlave
      * @param appAuditId
      * @return