@@ -242,15 +242,16 @@ func Delete(ctx context.Context, logger log.Logger, bkt objstore.Bucket, id ulid
242242
243243 // Some object storages represent directories as explicit empty objects.
244244 // We try to delete the directory marker objects themselves after all their contents are removed.
245- chunksDirName := path . Join ( id . String (), ChunksDirname ) + objstore . DirDelim
246- if err := bkt . Delete ( ctx , chunksDirName ); err != nil && ! bkt . IsObjNotFoundErr ( err ) {
247- level . Debug ( logger ). Log ( "msg" , "failed to delete directory marker object" , "dir" , chunksDirName , "err" , err )
248- }
245+ directoryMarkerPaths := [] string {
246+ path . Join ( id . String (), ChunksDirname ) + objstore . DirDelim ,
247+ id . String () + objstore . DirDelim ,
248+ }
249249
250- dirName := id .String () + objstore .DirDelim
251- if err := bkt .Delete (ctx , dirName ); err != nil && ! bkt .IsObjNotFoundErr (err ) {
252- level .Debug (logger ).Log ("msg" , "failed to delete directory marker object" , "dir" , dirName , "err" , err )
253- }
250+ for _ , p := range directoryMarkerPaths {
251+ if err := bkt .Delete (ctx , p ); err != nil && ! bkt .IsObjNotFoundErr (err ) {
252+ level .Debug (logger ).Log ("msg" , "failed to delete directory marker object" , "dir" , p , "err" , err )
253+ }
254+ }
254255
255256 return nil
256257}
0 commit comments