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

#1544) * Ignore object if it is the current directory Signed-off-by: Jamie Poole <jimbobby5@yahoo.com> * Add full-stop Signed-off-by: Jamie Poole <jimbobby5@yahoo.com> Signed-off-by: Giedrius Statkevičius <giedriuswork@gmail.com>
thanos-io · Oct 28, 2019 · a573c9d · a573c9d
1 parent 37a1a3a
commit a573c9d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/pkg/objstore/s3/s3.go b/pkg/objstore/s3/s3.go
@@ -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
 		}