Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compactor: Fix for #844 - Ignore object if it is the current directory #1544

Merged
merged 2 commits into from
Sep 24, 2019
Merged

Compactor: Fix for #844 - Ignore object if it is the current directory #1544

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03d3127
Ignore object if it is the current directory
jimbobby5 Sep 19, 2019
dddfa76
Add full-stop
jimbobby5 Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/objstore/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,10 @@ func (b *Bucket) Iter(ctx context.Context, dir string, f func(string) error) err
if object.Key == "" {
continue
}
// The s3 client can also return the directory itself in the ListObjects call above.
if object.Key == dir {
continue
}
if err := f(object.Key); err != nil {
return err
}
Expand Down