Skip to content

reconcile: prevent from staying in expanding state#2124

Merged
vrutkovs merged 3 commits into
masterfrom
fix-prevent-from-hanging-in-expanding
May 11, 2026
Merged

reconcile: prevent from staying in expanding state#2124
vrutkovs merged 3 commits into
masterfrom
fix-prevent-from-hanging-in-expanding

Conversation

@AndrewChubatiuk
Copy link
Copy Markdown
Contributor

@AndrewChubatiuk AndrewChubatiuk commented Apr 29, 2026

Summary by cubic

Always propagate reconcile errors from reconcileAndTrackStatus so the controller requeues and resources don’t get stuck in Expanding. Set resultErr for both Expanding and Failed outcomes, update tests to expect errors in retryable paths (conflict, wait interrupted/PVC resize), and add a vmoperator changelog entry.

Written for commit 9741a7e. Summary will update on new commits.

Copy link
Copy Markdown
Contributor

@cubic-dev-ai cubic-dev-ai Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 2 files

@AndrewChubatiuk AndrewChubatiuk force-pushed the fix-prevent-from-hanging-in-expanding branch from b7e95c8 to c31c75d Compare April 29, 2026 21:02
Copy link
Copy Markdown
Collaborator

@vrutkovs vrutkovs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, minor nitpick

Comment on lines 344 to +349
if reconcile.IsRetryable(err) {
resultStatus = vmv1beta1.UpdateStatusExpanding
} else {
resultStatus = vmv1beta1.UpdateStatusFailed
resultErr = err
}
resultErr = err
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
resultErr = err
resultStatus := vmv1beta1.UpdateStatusFailed
if reconcile.IsRetryable(err) {
resultStatus = vmv1beta1.UpdateStatusExpanding
}
resultErr = err

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Signed-off-by: Vadim Rutkovsky <vadim@vrutkovs.eu>
Signed-off-by: Vadim Rutkovsky <vadim@vrutkovs.eu>
@vrutkovs vrutkovs merged commit 548a34c into master May 11, 2026
4 checks passed
@vrutkovs vrutkovs deleted the fix-prevent-from-hanging-in-expanding branch May 11, 2026 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants