-
Notifications
You must be signed in to change notification settings - Fork 573
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.
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
Upgrade Thanos #1257
Upgrade Thanos #1257
Conversation
Moving to draft. We have to accurately check all Thanos changes we're going to vendor. Last time I checked I remember there was a change we may not want to get (but unfortunately I don't remember which one...). |
@pracucci thanks, I was about to move to draft myself seeing it doesn't build. |
0b7b3c1
to
37302ba
Compare
@@ -80,8 +80,7 @@ func TestGlobalMarkersBucket_DeleteShouldDeleteGlobalMarkIfBlockMarkerDoesntExis | |||
|
|||
// Delete block marker. | |||
err := bkt.Delete(ctx, tc.blockMarker) | |||
require.Error(t, err) | |||
require.True(t, bkt.IsObjNotFoundErr(err)) | |||
require.NoError(t, err) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The filesystem bucket implementation in Thanos has changed, to not treat missing files as an error.
37302ba
to
a48b084
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We have to accurately check all Thanos changes we're going to vendor. Last time I checked I remember there was a change we may not want to get (but unfortunately I don't remember which one...).
I checked Thanos changes, and cannot identify the one we wouldn't want. PR looks good to me.
There is new support in Thanos S3 client to use AWS-SDK auth, which we may want to expose at some point, but it doesn't need to be in this PR.
a48b084
to
7d8348a
Compare
Signed-off-by: Arve Knudsen <[email protected]>
7d8348a
to
4c3e4cf
Compare
What this PR does
Upgrade Thanos to 2315a3a60a35.
This revision includes improvement to shipper error message when thanos.shipper.json is invalid.
Which issue(s) this PR fixes
Fixes #1241.
Checklist
CHANGELOG.md
updated - the order of entries should be[CHANGE]
,[FEATURE]
,[ENHANCEMENT]
,[BUGFIX]