Merge pull request #1020 from ctripcorp/bugfix/cluster_cache

TooManyClustersRemovedException add clusterRemoved > 5 roles

Author: LanternLee

redis/redis-console/src/main/java/com/ctrip/xpipe/redis/console/resources/AbstractMetaCache.java

@@ -702,7 +702,8 @@ private void checkDcClustersCnt(DcMeta currentDcMeta, DcMeta futureDcMeta, int m
 
         int currentClusterCount = currentDcMeta.getClusters().size();
         int futureClusterCount = futureDcMeta.getClusters().size();
-        if ((currentClusterCount - futureClusterCount) > currentClusterCount * maxRemovedClusterPercent / 100)
+        int clusterRemoved = currentClusterCount - futureClusterCount;
+        if ((clusterRemoved) > currentClusterCount * maxRemovedClusterPercent / 100 && clusterRemoved > 5)
             throw new TooManyClustersRemovedException(String.format("dc:%s, current cluster count:%d,future cluster count:%d", currentDcMeta.getId(), currentClusterCount, futureClusterCount));
     }
 

redis/redis-console/src/test/java/com/ctrip/xpipe/redis/console/resources/DefaultMetaCacheTest.java

@@ -328,7 +328,7 @@ public void checkDcsCntTest() {
     public void checkClustersCntTest() {
         //removed too many clusters
         XpipeMeta currentMeta = new XpipeMeta();
-        currentMeta.addDc(new DcMeta("dc1").addCluster(new ClusterMeta("cluster1")).addCluster(new ClusterMeta("cluster2")).addCluster(new ClusterMeta("cluster3")))
+        currentMeta.addDc(new DcMeta("dc1").addCluster(new ClusterMeta("cluster1")).addCluster(new ClusterMeta("cluster2")).addCluster(new ClusterMeta("cluster3")).addCluster(new ClusterMeta("cluster4")).addCluster(new ClusterMeta("cluster5")).addCluster(new ClusterMeta("cluster6")).addCluster(new ClusterMeta("cluster7")))
                 .addDc(new DcMeta("dc2").addCluster(new ClusterMeta("cluster1")));
 
 
@@ -345,7 +345,7 @@ public void checkClustersCntTest() {
             Assert.assertTrue(th instanceof TooManyClustersRemovedException);
         }
         try {
-            metaCache.checkMeta(futureMeta, 1, 80);
+            metaCache.checkMeta(futureMeta, 1, 90);
         } catch (Throwable th) {
             Assert.fail();
         }