Fix race condition in filesystem bucket client Delete() #5103
Conversation
This file contains 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
pracucci
commented
Jan 26, 2022
| "github.com/thanos-io/thanos/pkg/testutil" | ||
| ) | ||
|
|
||
| func TestDelete_EmptyDirDeletionRaceCondition(t *testing.T) { |
There was a problem hiding this comment.
This test fails in main.
squat
reviewed
Jan 31, 2022
| if os.IsNotExist(err) { | ||
| // The directory doesn't exist. We don't consider it an error and we treat it like empty. | ||
| return true, nil | ||
| } else if err != nil { |
There was a problem hiding this comment.
Nit: since the first if returns, we normally style the second if without an else
Suggested change
| } else if err != nil { | |
| } | |
| if err != nil { |
There was a problem hiding this comment.
Sure, addressed it!
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
Signed-off-by: Marco Pracucci <marco@pracucci.com>
pracucci
force-pushed
the
fix-filesystem-delete-empty-dir-race-condition
branch
from
59678f7 to
11beece
Compare
squat
approved these changes
Feb 1, 2022
Nicholaswang
pushed a commit
to Nicholaswang/thanos
that referenced
this pull request
Mar 6, 2022
* Fix race condition in filesystem bucket client Delete() Signed-off-by: Marco Pracucci <marco@pracucci.com> * Added missing copyright header Signed-off-by: Marco Pracucci <marco@pracucci.com> * Addressed review comments Signed-off-by: Marco Pracucci <marco@pracucci.com> Signed-off-by: Nicholaswang <wzhever@gmail.com>
2 tasks
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.
Changes
I found a race condition in the filesystem bucket client
Delete(). The issue happen if 2 concurrent deletes occurs on different files in a subfolder containing only these 2 files. BothDelete()will try to delete the empty dir, but one of the two will fail with:In this PR I propose to handle the
no such file or directoryin theisDirEmpty().isDirEmpty()is used by Iter() and Delete(). InIter()it's just used to skip empty dirs, so I think this change is fine there too.Verification
New unit test.