Merge pull request #154 from stefanotorresi/fix/corosync-membership-p…

…arsing fix corosync membership parsing
ClusterLabs · May 4, 2020 · 3a3faf7 · 3a3faf7
2 parents a48d353 + dff5f0d
commit 3a3faf7
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 2 deletions.
diff --git a/collector/corosync/parser.go b/collector/corosync/parser.go
@@ -193,7 +193,7 @@ func parseMembers(quorumToolOutput []byte) (members []Member, err error) {
 	   		1          1 192.168.125.24
 	   		2          1 192.168.125.25 (local)
 	*/
-	sectionRE := regexp.MustCompile(`(?m)Membership information\n-+\s+Nodeid\s+Votes\s+Name\n((?:\w+\s+\d+\s[\w-]+(?:\s\(local\))?\n?)+)`)
+	sectionRE := regexp.MustCompile(`(?m)Membership information\n-+\s+Nodeid\s+Votes\s+Name\n+((?:.*\n?)+)`)
 	sectionMatch := sectionRE.FindSubmatch(quorumToolOutput)
 	if sectionMatch == nil {
 		return nil, errors.New("could not find membership information")
@@ -203,7 +203,7 @@ func parseMembers(quorumToolOutput []byte) (members []Member, err error) {
 	/*
 		1          1 192.168.125.24 (local)
 	*/
-	linesRE := regexp.MustCompile(`(?m)(?P<node_id>\w+)\s+(?P<votes>\d+)\s(?P<name>[\w-]+)(?:\s(?P<local>\(local\)))?\n?`)
+	linesRE := regexp.MustCompile(`(?m)(?P<node_id>\w+)\s+(?P<votes>\d+)\s(?P<name>[\w-\.]+)(?:\s(?P<local>\(local\)))?\n?`)
 	linesMatches := linesRE.FindAllSubmatch(sectionMatch[1], -1)
 	for _, match := range linesMatches {
 		matches := extractRENamedCaptureGroups(linesRE, match)

diff --git a/collector/corosync/parser_test.go b/collector/corosync/parser_test.go
@@ -194,3 +194,42 @@ func TestParseMembersUintError(t *testing.T) {
 	assert.Contains(t, err.Error(), "could not parse vote number to uint64")
 	assert.Contains(t, err.Error(), "value out of range")
 }
+
+func TestParseMembersWithAnotherExample(t *testing.T) {
+	quorumToolOutput := []byte(`Quorum information
+------------------
+Date:             Mon May  4 16:50:13 2020
+Quorum provider:  corosync_votequorum
+Nodes:            2
+Node ID:          2
+Ring ID:          1/8
+Quorate:          Yes
+
+Votequorum information
+----------------------
+Expected votes:   2
+Highest expected: 2
+Total votes:      2
+Quorum:           1  
+Flags:            2Node Quorate WaitForAll 
+
+Membership information
+----------------------
+    Nodeid      Votes Name
+         1          1 192.168.127.20
+         2          1 192.168.127.21 (local)`)
+
+	members, err := parseMembers(quorumToolOutput)
+
+	assert.NoError(t, err)
+
+	assert.Len(t, members, 2)
+	assert.Exactly(t, "1", members[0].Id)
+	assert.Exactly(t, "192.168.127.20", members[0].Name)
+	assert.False(t, members[0].Local)
+	assert.EqualValues(t, 1, members[0].Votes)
+	assert.Exactly(t, "2", members[1].Id)
+	assert.Exactly(t, "192.168.127.21", members[1].Name)
+	assert.True(t, members[1].Local)
+	assert.EqualValues(t, 1, members[1].Votes)
+}