From b13352f00f09cd0ebb9cd60322be288bdd746200 Mon Sep 17 00:00:00 2001 From: "Louise K. Schmidtgen" Date: Wed, 4 Feb 2026 09:15:35 +0200 Subject: [PATCH] internal/state: add ctx deadline exceeded check on membership consistency check Signed-off-by: Louise K. Schmidtgen --- internal/state/state.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/state/state.go b/internal/state/state.go index 61ae87c7..1f7ff268 100644 --- a/internal/state/state.go +++ b/internal/state/state.go @@ -249,6 +249,11 @@ func (s *InternalState) CheckMembershipConsistency(ctx context.Context) error { } for { + ctxErr := ctx.Err() + if ctxErr != nil { + return fmt.Errorf("Membership consistency check failed: %w", ctxErr) + } + coreClusterMembers, truststoreRemotes, dqliteNodes, err := s.getMembershipData(ctx) if err != nil { return fmt.Errorf("Failed to gather membership data for consistency check: %w", err) @@ -258,7 +263,7 @@ func (s *InternalState) CheckMembershipConsistency(ctx context.Context) error { if err != nil { select { case <-ctx.Done(): - return fmt.Errorf("Membership consistency check failed after timeout: %w", err) + return fmt.Errorf("Membership consistency check failed: %w", err) case <-time.After(200 * time.Millisecond): continue }