Retry instance directory deletion on ENOTEMPTY#191
Merged
sjmiller609 merged 1 commit intomainfrom Apr 8, 2026
Merged
Conversation
hiroTamada
approved these changes
Apr 8, 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
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.
Summary
os.RemoveAllloses a race with concurrent writers and returnsENOTEMPTYTesting
go test ./lib/instances -run 'TestRemoveAllWithRetry|TestMetadataPersistence'(fails in this checkout because embedded binarieslib/system/guest_agent/guest-agentandlib/hypervisor/vz/vz-shim/vz-shimare missing)Note
Medium Risk
Touches instance deletion cleanup by adding retry/backoff around
os.RemoveAll, which could impact teardown timing and error handling if the retry logic misbehaves. Change is localized and guarded to only retryENOTEMPTYwith a small capped backoff.Overview
Improves instance teardown robustness by retrying instance directory removal when
os.RemoveAllfails withENOTEMPTY, using an exponential backoff (10ms doubling, capped at 100ms) for up to 5 retries viaremoveAllWithRetry.Adds unit tests covering both the successful retry path and the max-retry exhaustion behavior, including verification of the backoff schedule.
Reviewed by Cursor Bugbot for commit 4a33f36. Bugbot is set up for automated code reviews on this repo. Configure here.