Fix node ID resolution bug in deadmember logic (#147)

davissp14 · web-flow · commit 93d0c3a29959 · 2023-02-27T08:47:27.000-06:00
Clean up logic a bit

Rename function to remove confusion

Just use resolve member without id

Fix
diff --git a/cmd/monitor/monitor_dead_members.go b/cmd/monitor/monitor_dead_members.go
@@ -58,9 +58,9 @@ func deadMemberMonitorTick(ctx context.Context, node *flypg.Node, seenAt map[int
 	}
 	defer func() { _ = conn.Close(ctx) }()
 
-	member, err := node.RepMgr.MemberByID(ctx, conn, int(node.RepMgr.ID))
+	member, err := node.RepMgr.Member(ctx, conn)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to resolve member: %s", err)
 	}
 
 	if member.Role != flypg.PrimaryRoleName {

Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,9 @@ func deadMemberMonitorTick(ctx context.Context, node *flypg.Node, seenAt map[int`
`58`	`58`	`}`
`59`	`59`	`defer func() { _ = conn.Close(ctx) }()`
`60`	`60`
`61`		`- member, err := node.RepMgr.MemberByID(ctx, conn, int(node.RepMgr.ID))`
	`61`	`+ member, err := node.RepMgr.Member(ctx, conn)`
`62`	`62`	`if err != nil {`
`63`		`- return err`
	`63`	`+ return fmt.Errorf("failed to resolve member: %s", err)`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`if member.Role != flypg.PrimaryRoleName {`