Merge pull request #1475 from openshift-cherrypick-robot/cherry-pick-1474-to-release-4.19

openshift-merge-bot[bot] · web-flow · commit b24b91c5aa18 · 2025-10-03T09:56:16.000Z
[release-4.19] OCPBUGS-61019: add individual context to the health check
diff --git a/pkg/etcdcli/health.go b/pkg/etcdcli/health.go
@@ -63,7 +63,12 @@ func GetMemberHealth(ctx context.Context, clipool *EtcdClientPool, etcdMembers [
 			}
 			defer clipool.Return(cli)
 
-			memberHealth[i] = checkSingleMemberHealth(ctx, cli, member)
+			// Create an independent timeout context for each member health check
+			// This prevents one slow member from affecting other members' health checks
+			memberCtx, cancel := context.WithTimeout(ctx, DefaultClientTimeout)
+			defer cancel()
+
+			memberHealth[i] = checkSingleMemberHealth(memberCtx, cli, member)
 		}(i)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,12 @@ func GetMemberHealth(ctx context.Context, clipool *EtcdClientPool, etcdMembers [`
`63`	`63`	`}`
`64`	`64`	`defer clipool.Return(cli)`
`65`	`65`
`66`		`- memberHealth[i] = checkSingleMemberHealth(ctx, cli, member)`
	`66`	`+ // Create an independent timeout context for each member health check`
	`67`	`+ // This prevents one slow member from affecting other members' health checks`
	`68`	`+ memberCtx, cancel := context.WithTimeout(ctx, DefaultClientTimeout)`
	`69`	`+ defer cancel()`
	`70`	`+`
	`71`	`+ memberHealth[i] = checkSingleMemberHealth(memberCtx, cli, member)`
`67`	`72`	`}(i)`
`68`	`73`	`}`
`69`	`74`