Use a context in S3's AddFiles

Signed-off-by: Florent Poinsard <[email protected]>

go/vt/mysqlctl/s3backupstorage/s3.go

@@ -182,8 +182,7 @@ func (bh *S3BackupHandle) AddFile(ctx context.Context, filename string, filesize
 		})
 		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(context.Background(), &s3.PutObjectInput{
+		_, err := uploader.Upload(ctx, &s3.PutObjectInput{
 			Bucket:               &bucket,
 			Key:                  &object,
 			Body:                 reader,

go/vt/mysqlctl/xtrabackupengine.go

@@ -316,8 +316,15 @@ func (be *XtrabackupEngine) backupFiles(
 	// would impose a timeout that starts counting right now, so it would
 	// include the time spent uploading the file content. We only want to impose
 	// a timeout on the final Close() step.
+	// This context also allows us to immediately abort AddFiles if we encountered
+	// an error in this function.
 	addFilesCtx, cancelAddFiles := context.WithCancel(ctx)
-	defer cancelAddFiles()
+	defer func() {
+		if finalErr != nil {
+			cancelAddFiles()
+		}
+	}()
+
 	destFiles, err := addStripeFiles(addFilesCtx, params, bh, backupFileName, numStripes)
 	if err != nil {
 		return replicationPosition, vterrors.Wrapf(err, "cannot create backup file %v", backupFileName)