Upload global marker before local (#4949)

danielblando · web-flow · commit 7c798bcc16d5 · 2022-11-04T15:18:21.000-07:00
Signed-off-by: Daniel Deluiggi &lt;ddeluigg@amazon.com&gt;

Signed-off-by: Daniel Deluiggi &lt;ddeluigg@amazon.com&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -72,6 +72,7 @@
 * [BUGFIX] QueryFrontend: fixed query_range requests when query has `start` equals to `end`. #4877
 * [BUGFIX] AlertManager: fixed issue introduced by #4495 where templates files were being deleted when using alertmanager local store. #4890
 * [BUGFIX] Ingester: fixed incorrect logging at the start of ingester block shipping logic. #4934
+* [BUGFIX] Storage/Bucket: fixed global mark missing on deletion. #4949
 
 ## 1.13.0 2022-07-14
 
diff --git a/pkg/storage/tsdb/bucketindex/markers_bucket_client.go b/pkg/storage/tsdb/bucketindex/markers_bucket_client.go
@@ -37,13 +37,13 @@ func (b *globalMarkersBucket) Upload(ctx context.Context, name string, r io.Read
 		return err
 	}
 
-	// Upload it to the original location.
-	if err := b.parent.Upload(ctx, name, bytes.NewBuffer(body)); err != nil {
+	// Upload it to the global marker's location.
+	if err := b.parent.Upload(ctx, globalMarkPath, bytes.NewBuffer(body)); err != nil {
 		return err
 	}
 
-	// Upload it to the global markers location too.
-	return b.parent.Upload(ctx, globalMarkPath, bytes.NewBuffer(body))
+	// Upload it to the original location too.
+	return b.parent.Upload(ctx, name, bytes.NewBuffer(body))
 }
 
 // Delete implements objstore.Bucket.

Original file line number	Diff line number	Diff line change
`@@ -37,13 +37,13 @@ func (b *globalMarkersBucket) Upload(ctx context.Context, name string, r io.Read`
`37`	`37`	`return err`
`38`	`38`	`}`
`39`	`39`
`40`		`- // Upload it to the original location.`
`41`		`- if err := b.parent.Upload(ctx, name, bytes.NewBuffer(body)); err != nil {`
	`40`	`+ // Upload it to the global marker's location.`
	`41`	`+ if err := b.parent.Upload(ctx, globalMarkPath, bytes.NewBuffer(body)); err != nil {`
`42`	`42`	`return err`
`43`	`43`	`}`
`44`	`44`
`45`		`- // Upload it to the global markers location too.`
`46`		`- return b.parent.Upload(ctx, globalMarkPath, bytes.NewBuffer(body))`
	`45`	`+ // Upload it to the original location too.`
	`46`	`+ return b.parent.Upload(ctx, name, bytes.NewBuffer(body))`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// Delete implements objstore.Bucket.`