Skip to content

fix(component): Persist member join status on conflict#10491

Open
nashtsai wants to merge 2 commits into
apecloud:mainfrom
nashtsai:fix/10359-member-join-status-conflict
Open

fix(component): Persist member join status on conflict#10491
nashtsai wants to merge 2 commits into
apecloud:mainfrom
nashtsai:fix/10359-member-join-status-conflict

Conversation

@nashtsai

@nashtsai nashtsai commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Summary

  • persist memberJoin success to the live InstanceSet replica-status annotation immediately after the action succeeds
  • retry that live InstanceSet update on resourceVersion conflicts before relying on future scale-in status
  • add a unit test that simulates an update conflict and verifies memberJoined=true is retained

Fixes #10359

Tests

  • make test-go-generate
  • go test ./controllers/apps/component -run TestPersistMemberJoinedRetriesUpdateConflict -count=1

Note: the envtest-backed Ginkgo suite was not run because /usr/local/kubebuilder/bin/etcd is not installed in this environment.

@nashtsai nashtsai requested review from a team and leon-ape as code owners July 1, 2026 06:16
@github-actions github-actions Bot added the size/L Denotes a PR that changes 100-499 lines. label Jul 1, 2026
@apecloud-bot

Copy link
Copy Markdown
Collaborator

Auto Cherry-pick Instructions

Usage:
  - /nopick: Not auto cherry-pick when PR merged.
  - /pick: release-x.x [release-x.x]: Auto cherry-pick to the specified branch when PR merged.

Example:
  - /nopick
  - /pick release-1.1

CLA Recheck Instructions

Usage:
  - /recheck-cla: Trigger a re-check of CLA status for this pull request.
Example:
  - /recheck-cla

@apecloud-bot apecloud-bot added the pre-approve Fork PR Pre Approve Test label Jul 1, 2026
@nashtsai

nashtsai commented Jul 1, 2026

Copy link
Copy Markdown
Contributor Author

/nopick

@apecloud-bot apecloud-bot added the nopick Not auto cherry-pick when PR merged label Jul 1, 2026
…in-status-conflict

# Conflicts:
#	controllers/apps/component/transformer_component_workload_test.go
@apecloud-bot apecloud-bot added pre-approve Fork PR Pre Approve Test and removed pre-approve Fork PR Pre Approve Test labels Jul 1, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

nopick Not auto cherry-pick when PR merged pre-approve Fork PR Pre Approve Test size/L Denotes a PR that changes 100-499 lines.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

memberJoin success can lose joined status on conflict

2 participants