Merge pull request redis#1701 from kingsumos/node_description

antirez · antirez · commit e0918a332dd2 · 2014-04-23T11:37:47.000+02:00
fix cluster node description showing wrong slot allocation
diff --git a/src/cluster.c b/src/cluster.c
@@ -3131,7 +3131,7 @@ sds clusterGenNodeDescription(clusterNode *node) {
             if (start == -1) start = j;
         }
         if (start != -1 && (!bit || j == REDIS_CLUSTER_SLOTS-1)) {
-            if (j == REDIS_CLUSTER_SLOTS-1) j++;
+            if (bit && j == REDIS_CLUSTER_SLOTS-1) j++;
 
             if (start == j-1) {
                 ci = sdscatprintf(ci," %d",start);

Original file line number	Diff line number	Diff line change
`@@ -3131,7 +3131,7 @@ sds clusterGenNodeDescription(clusterNode *node) {`
`3131`	`3131`	`if (start == -1) start = j;`
`3132`	`3132`	`}`
`3133`	`3133`	`if (start != -1 && (!bit \|\| j == REDIS_CLUSTER_SLOTS-1)) {`
`3134`		`- if (j == REDIS_CLUSTER_SLOTS-1) j++;`
	`3134`	`+ if (bit && j == REDIS_CLUSTER_SLOTS-1) j++;`
`3135`	`3135`
`3136`	`3136`	`if (start == j-1) {`
`3137`	`3137`	`ci = sdscatprintf(ci," %d",start);`