fix(cruisecontrol): re-validate remove_disks log dirs before retrying - #325
Merged
amuraru merged 2 commits intoAug 28, 2026
Merged
Conversation
amuraru
added a commit
to amuraru/koperator
that referenced
this pull request
Aug 26, 2026
adobe#325 added re-validation before retrying a stalled remove_disks operation, so the rejection this test gates against is no longer permanent. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
amuraru
added a commit
that referenced
this pull request
Aug 27, 2026
* test(e2e): fix multi-disk removal test racing Cruise Control rebalance/rollout Gate disk removal on CC being idle and fully rolled out (same fix already applied to broker removal in #291), and patch storageConfigs directly instead of applying a full manifest. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> * docs(e2e): fix stale comment now that remove_disks retries self-heal #325 added re-validation before retrying a stalled remove_disks operation, so the rejection this test gates against is no longer permanent. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
amuraru
force-pushed
the
fix/cc-removedisks-stale-retry-snapshot
branch
from
August 27, 2026 18:49
f89f9b9 to
f20c4e2
Compare
OperationRemoveDisks retries replayed a brokerid_and_logdirs snapshot frozen at creation time; if Cruise Control's view diverged (e.g. restart mid-race), the identical invalid request retried forever. Skip stale retries until Cruise Control's current state agrees with the snapshot again. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
amuraru
force-pushed
the
fix/cc-removedisks-stale-retry-snapshot
branch
from
August 28, 2026 06:45
f20c4e2 to
f4543fe
Compare
…s wait The final "cluster healthy"/"no deadlock" assertions in the multi-disk removal and config-change+disk-removal e2e scenarios waited on kafkaClusterResourceReadinessTimeout (300s), while every other step in the same scenarios already uses the scenario's own 1800s budget because a disk-removal-driven rolling restart across all brokers (fresh PVC provisioning included) can legitimately take longer than 5 minutes under CI load. Observed on adobe#325 and adobe#326: both failed with the exact same "timeout waiting for KafkaCluster ... after 5m0s" symptom at this one under-budgeted step, on otherwise unrelated PRs, while the preceding disk-removal/CC-quiescence checks (already on the 1800s budget) passed. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
azun
approved these changes
Aug 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
OperationRemoveDisks retries replay a
brokerid_and_logdirssnapshot frozen at operation-creation time; if Cruise Control's view diverges (e.g. a CC restart mid-race, see #301), the identical invalid request retries forever. Skip stale retries until CC's current state agrees with the snapshot again.🤖 Generated with Claude Code