Merge pull request #144 from tair-opensource/codex/fix-cluster-node-role-parsing

fix: correctly parse cluster role flags with nofailover

Author: suxb201

src/full_check/common/command.go

@@ -67,19 +67,16 @@ func ParseClusterNode(content []byte) []*ClusterNodeInfo {
 			continue
 		}
 
-		items := bytes.Split(line, []byte(" "))
+		items := bytes.Fields(line)
+		if len(items) < 8 {
+			continue
+		}
 
 		address := bytes.Split(items[1], []byte{'@'})
-		flag := bytes.Split(items[2], []byte{','})
-		var role string
-		if len(flag) > 1 {
-			role = string(flag[1])
-		} else {
-			role = string(flag[0])
-		}
+		role := parseClusterNodeRole(items[2])
 		var slot string
-		if len(items) > 7 {
-			slot = string(items[7])
+		if len(items) > 8 {
+			slot = string(items[8])
 		}
 		ret = append(ret, &ClusterNodeInfo{
 			Id:          string(items[0]),
@@ -96,13 +93,27 @@ func ParseClusterNode(content []byte) []*ClusterNodeInfo {
 	return ret
 }
 
+func parseClusterNodeRole(flags []byte) string {
+	parts := bytes.Split(flags, []byte{','})
+	for _, part := range parts {
+		if bytes.Equal(part, []byte(TypeMaster)) || bytes.Equal(part, []byte(TypeSlave)) {
+			return string(part)
+		}
+	}
+
+	if len(parts) > 0 {
+		return string(parts[0])
+	}
+	return ""
+}
+
 // needMaster: true(master), false(slave)
 func ClusterNodeChoose(input []*ClusterNodeInfo, role string) []*ClusterNodeInfo {
 	ret := make([]*ClusterNodeInfo, 0, len(input))
 	for _, ele := range input {
 		if ele.Flags == TypeMaster && role == TypeMaster ||
-				ele.Flags == TypeSlave && role == TypeSlave ||
-				role == TypeAll {
+			ele.Flags == TypeSlave && role == TypeSlave ||
+			role == TypeAll {
 			ret = append(ret, ele)
 		}
 	}
@@ -154,4 +165,4 @@ func CompareUnorderedList(a, b []string) bool {
 	}
 
 	return true
-}
+}

src/full_check/common/command_test.go

@@ -0,0 +1,25 @@
+package common
+
+import "testing"
+
+func TestParseClusterNodeRole(t *testing.T) {
+	content := []byte("" +
+		"node1 11.0.0.1:6379@16379 master,nofailover - 0 1 1 connected 0-2047\n" +
+		"node2 11.0.0.2:6379@16379 myself,master,nofailover - 0 1 2 connected 2048-4095\n" +
+		"node3 11.0.0.3:6379@16379 slave,node1 - 0 1 3 connected\n")
+
+	nodes := ParseClusterNode(content)
+	if len(nodes) != 3 {
+		t.Fatalf("expected 3 nodes, got %d", len(nodes))
+	}
+
+	if nodes[0].Flags != TypeMaster {
+		t.Fatalf("expected first node role %q, got %q", TypeMaster, nodes[0].Flags)
+	}
+	if nodes[1].Flags != TypeMaster {
+		t.Fatalf("expected second node role %q, got %q", TypeMaster, nodes[1].Flags)
+	}
+	if nodes[2].Flags != TypeSlave {
+		t.Fatalf("expected third node role %q, got %q", TypeSlave, nodes[2].Flags)
+	}
+}