Migrate the S3 SDK from v1 to v2 #16664
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Review ChecklistHello reviewers! 👋 Please follow this checklist when reviewing this Pull Request. General
Tests
Documentation
New flags
If a workflow is added or modified:
Backward compatibility
|
vitess-bot
bot
added
NeedsBackportReason
frouioui
force-pushed
the
migrate-to-s3-v2
branch
2 times, most recently
from
bd75773
to
9edbe34
Compare
Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
frouioui
force-pushed
the
migrate-to-s3-v2
branch
from
9edbe34
to
dc21803
Compare
frouioui
added
Type: Internal Cleanup
Component: Backup and Restore
and removed
NeedsDescriptionUpdate
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #16664 +/- ##
==========================================
- Coverage 68.98% 68.96% -0.03%
==========================================
Files 1562 1565 +3
Lines 200690 201770 +1080
==========================================
+ Hits 138449 139142 +693
- Misses 62241 62628 +387 ☔ View full report in Codecov by Sentry. |
frouioui
commented
Sep 12, 2024
| u.PartSize = partSizeBytes | ||
| }) | ||
| object := objName(bh.dir, bh.name, filename) | ||
| sendStats := bh.bs.params.Stats.Scope(stats.Operation("AWS:Request:Send")) | ||
| // Using UploadWithContext breaks uploading to Minio and Ceph https://github.com/vitessio/vitess/issues/14188 | ||
| _, err := uploader.Upload(&s3manager.UploadInput{ | ||
| _, err := uploader.Upload(context.Background(), &s3.PutObjectInput{ |
There was a problem hiding this comment.
Using context.Background() is a side-effect of the issue described in #14188. Upgrading to the SDK V2 does not fix it, the issue is rooted in how we handle the context and the goroutines. I started investigating the issue a bit deeper and will continue in a subsequent PR.
frouioui
requested review from
deepthi,
mattlord,
ajm188,
harshit-gangal,
rohit-nayak-ps and
systay
as code owners
deepthi
reviewed
Sep 12, 2024
| r: &request.Request{ | ||
| Retryable: aws.Bool(false), | ||
| }, | ||
| name: "no error", |
| @@ -277,7 +277,7 @@ func (be *XtrabackupEngine) executeFullBackup(ctx context.Context, params Backup | |||
| if err != nil { | |||
| return BackupUnusable, vterrors.Wrapf(err, "cannot JSON encode %v", backupManifestFileName) | |||
| } | |||
| if _, err := mwc.Write([]byte(data)); err != nil { | |||
| if _, err := mwc.Write(data); err != nil { | |||
There was a problem hiding this comment.
This code is going to be called regardless of s3 or other storage backend. Why this change?
There was a problem hiding this comment.
data is a already a slice of bytes, I saw it while debugging something and thought I'd remove the useless conversion, I can revert if you want
deepthi
approved these changes
Sep 17, 2024
mattlord
approved these changes
Sep 17, 2024
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR updates the version of the AWS SDK from v1 to v2. The version 1 has been deprecated for some time now.
I have ran the following manual test:
mainbranchmigrate-to-s3-v2branch (with--restore_from_backup)RestoreFromBackup)main) from AWS S3mainbranch (with--restore_from_backup)This test ensures that we can upgrade: old backups will still work with the new code, and that we can downgrade: new backups will work with the old code. While making sure that no config/flag change is needed between the two code version. It also checks that the
GetBackupsandRestoreFromBackupvtctldclient commands work.Checklist