s3: populate Initiated timestamp in ListMultipartUploads (#11313)

* s3: populate Initiated timestamp in ListMultipartUploads

ListMultipartUploads returned each upload with only Key and UploadId,
omitting the Initiated timestamp. Clients such as GeeseFS rely on this
field to expire stale uploads and crash on its absence. Set Initiated
from the upload directory entry creation time so repeated listings
preserve the original initiation time.

* test/s3: verify Initiated timestamp in ListMultipartUploads

Add an integration test that initiates a multipart upload, lists it,
and asserts the Initiated field is populated and preserved across
repeated listings rather than reflecting the listing time.
This commit is contained in:
Chris Lu
2026-09-14 16:03:51 -07:00
committed by GitHub
parent 0bd048b76f
commit 0e82b4e351
2 changed files with 72 additions and 2 deletions
@@ -0,0 +1,66 @@
package example
import (
"testing"
"time"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
// TestListMultipartUploadsInitiated verifies that ListMultipartUploads
// returns the Initiated timestamp for each in-progress upload, and that
// the timestamp is preserved across repeated listings rather than
// reflecting the time of the listing.
func TestListMultipartUploadsInitiated(t *testing.T) {
if testing.Short() {
t.Skip("Skipping integration test in short mode")
}
cluster, err := startMiniCluster(t)
require.NoError(t, err)
defer cluster.Stop()
bucket := createTestBucket(t, cluster, "test-list-mpu-initiated-")
beforeInit := time.Now().UTC()
createOut, err := cluster.s3Client.CreateMultipartUpload(&s3.CreateMultipartUploadInput{
Bucket: aws.String(bucket),
Key: aws.String("unfinished.bin"),
})
require.NoError(t, err)
afterInit := time.Now().UTC()
listOut, err := cluster.s3Client.ListMultipartUploads(&s3.ListMultipartUploadsInput{
Bucket: aws.String(bucket),
})
require.NoError(t, err)
require.Len(t, listOut.Uploads, 1)
upload := listOut.Uploads[0]
assert.Equal(t, "unfinished.bin", aws.StringValue(upload.Key))
assert.Equal(t, aws.StringValue(createOut.UploadId), aws.StringValue(upload.UploadId))
require.NotNil(t, upload.Initiated, "Initiated timestamp must be populated")
initiated := upload.Initiated.UTC()
assert.False(t, initiated.Before(beforeInit.Add(-time.Second)), "Initiated %v is before upload creation %v", initiated, beforeInit)
assert.False(t, initiated.After(afterInit.Add(time.Second)), "Initiated %v is after upload creation %v", initiated, afterInit)
time.Sleep(2 * time.Second)
listOut2, err := cluster.s3Client.ListMultipartUploads(&s3.ListMultipartUploadsInput{
Bucket: aws.String(bucket),
})
require.NoError(t, err)
require.Len(t, listOut2.Uploads, 1)
require.NotNil(t, listOut2.Uploads[0].Initiated, "Initiated timestamp must be populated on repeated listing")
assert.True(t, listOut2.Uploads[0].Initiated.Equal(*upload.Initiated), "Initiated must be preserved across listings, got %v then %v", *upload.Initiated, *listOut2.Uploads[0].Initiated)
_, err = cluster.s3Client.AbortMultipartUpload(&s3.AbortMultipartUploadInput{
Bucket: aws.String(bucket),
Key: aws.String("unfinished.bin"),
UploadId: createOut.UploadId,
})
require.NoError(t, err)
}
+6 -2
View File
@@ -1072,10 +1072,14 @@ func (s3a *S3ApiServer) listMultipartUploads(input *s3.ListMultipartUploadsInput
if *input.Prefix != "" && !strings.HasPrefix(key, *input.Prefix) {
continue
}
output.Upload = append(output.Upload, &s3.MultipartUpload{
upload := &s3.MultipartUpload{
Key: objectKey(aws.String(key)),
UploadId: aws.String(entry.Name),
})
}
if entry.Attributes != nil {
upload.Initiated = aws.Time(time.Unix(entry.Attributes.Crtime, int64(entry.Attributes.CrtimeNs)))
}
output.Upload = append(output.Upload, upload)
uploadsCount += 1
}
if uploadsCount >= *input.MaxUploads {