Skip to content

Fix: S3 GW list multipart uploads ordering #9847

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.

Sign up for GitHub

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

Open
N-o-Z wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Fix: S3 GW list multipart uploads ordering #9847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d60edf
Fix: S3 GW list multipart uploads ordering
N-o-Z Dec 17, 2025
2a720b0
Merge remote-tracking branch 'origin/master' into fix/s3gw-list-parts…
N-o-Z Dec 29, 2025
530d4dc
CR Fixes 1
N-o-Z Dec 29, 2025
16b7244
CR Fixes 2
N-o-Z Dec 30, 2025
fabed53
Merge remote-tracking branch 'origin/master' into fix/s3gw-list-parts…
N-o-Z Jan 12, 2026
718b9cd
CR Fixes
N-o-Z Jan 12, 2026
9a265c0
Merge branch 'master' into fix/s3gw-list-parts-ordering-9554
N-o-Z Jan 20, 2026
b9ab48f
Fix merge
N-o-Z Jan 20, 2026
405c6bd
Merge branch 'master' into fix/s3gw-list-parts-ordering-9554
N-o-Z Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions esti/commit_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ type Upload struct {
Repo, Branch, Path string
}

// upload uploads random file data for uploads.
func upload(ctx context.Context, uploads chan Upload) error {
// uploadRandomData uploads random file data for uploads.
func uploadRandomData(ctx context.Context, uploads chan Upload) error {
for u := range uploads {
_, _, err := UploadFileRandomDataAndReport(ctx, u.Repo, u.Branch, u.Path, false, nil)
if err != nil {
Expand All @@ -77,7 +77,7 @@ func TestCommitInMixedOrder(t *testing.T) {
wg := sync.WaitGroup{}
for range parallelism {
wg.Go(func() {
if err := upload(ctx, uploads); err != nil {
if err := uploadRandomData(ctx, uploads); err != nil {
t.Error(err)
}
})
Expand All @@ -104,7 +104,7 @@ func TestCommitInMixedOrder(t *testing.T) {
wg = sync.WaitGroup{}
for range parallelism {
wg.Go(func() {
if err := upload(ctx, uploads); err != nil {
if err := uploadRandomData(ctx, uploads); err != nil {
t.Error(err)
}
})
Expand Down
34 changes: 7 additions & 27 deletions esti/multipart_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,8 @@ func TestMultipartUpload(t *testing.T) {
defer tearDownTest(repo)
file := "multipart_file"
path := mainBranch + "/" + file
input := &s3.CreateMultipartUploadInput{
Bucket: aws.String(repo),
Key: aws.String(path),
}

resp, err := svc.CreateMultipartUpload(ctx, input)
require.NoError(t, err, "failed to create multipart upload")
resp := createMultipartHelper(ctx, t, svc, repo, path)
logger.Info("Created multipart upload request")

parts := make([][]byte, multipartNumberOfParts)
Expand Down Expand Up @@ -101,30 +96,20 @@ func TestMultipartUploadAbort(t *testing.T) {

t.Run("exists", func(t *testing.T) {
const objPath = mainBranch + "/multipart_file1"
createInput := &s3.CreateMultipartUploadInput{
Bucket: aws.String(repo),
Key: aws.String(objPath),
}
createResp, err := svc.CreateMultipartUpload(ctx, createInput)
require.NoError(t, err, "CreateMultipartUpload")
createResp := createMultipartHelper(ctx, t, svc, repo, objPath)

abortInput := &s3.AbortMultipartUploadInput{
Bucket: aws.String(repo),
Key: aws.String(objPath),
UploadId: createResp.UploadId,
}
_, err = svc.AbortMultipartUpload(ctx, abortInput)
_, err := svc.AbortMultipartUpload(ctx, abortInput)
require.NoError(t, err, "AbortMultipartUpload")
})

t.Run("unknown_upload_id", func(t *testing.T) {
const objPath = mainBranch + "/multipart_file2"
createInput := &s3.CreateMultipartUploadInput{
Bucket: aws.String(repo),
Key: aws.String(objPath),
}
createResp, err := svc.CreateMultipartUpload(ctx, createInput)
require.NoError(t, err, "CreateMultipartUpload")
createResp := createMultipartHelper(ctx, t, svc, repo, objPath)

uploadID := aws.ToString(createResp.UploadId)
// reverse the upload id to get valid unknown upload id
Expand All @@ -135,25 +120,20 @@ func TestMultipartUploadAbort(t *testing.T) {
Key: aws.String(objPath),
UploadId: aws.String(unknownUploadID),
}
_, err = svc.AbortMultipartUpload(ctx, abortInput)
_, err := svc.AbortMultipartUpload(ctx, abortInput)
require.Error(t, err, "AbortMultipartUpload should fail with unknown upload id")
})

t.Run("unknown_key", func(t *testing.T) {
const objPath = mainBranch + "/multipart_file3"
createInput := &s3.CreateMultipartUploadInput{
Bucket: aws.String(repo),
Key: aws.String(objPath),
}
createResp, err := svc.CreateMultipartUpload(ctx, createInput)
require.NoError(t, err, "CreateMultipartUpload")
createResp := createMultipartHelper(ctx, t, svc, repo, objPath)

abortInput := &s3.AbortMultipartUploadInput{
Bucket: aws.String(repo),
Key: aws.String(mainBranch + "/unknown_file"),
UploadId: createResp.UploadId,
}
_, err = svc.AbortMultipartUpload(ctx, abortInput)
_, err := svc.AbortMultipartUpload(ctx, abortInput)
require.Error(t, err, "AbortMultipartUpload should fail with unknown key")
})
}
Expand Down
Loading
Loading