extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-22 08:23:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

serve s3: fix in-memory metadata storing wrong modtime

Browse Source 
Before this change, serve s3 did not consistently save the correct modtime value
in memory after putting or copying an object, which could sometimes cause an
incorrect modtime to be returned. This change fixes the issue by ensuring that
both "mtime" and "X-Amz-Meta-Mtime" are updated in b.meta when we have fresh data.

The issue was discovered on the TestBisyncRemoteRemote/ext_paths test.
This commit is contained in:
nielash 2024-04-29 02:36:34 -04:00 committed by Nick Craig-Wood
parent a56cd52025
commit c13118246c
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/serve/s3/backend.go
View File

@ -213,6 +213,14 @@ func (b *s3Backend) GetObject(ctx context.Context, bucketName, objectName string
}, nil }, nil
} }
// storeModtime sets both "mtime" and "X-Amz-Meta-Mtime" to val in b.meta.
// Call this whenever modtime is updated.
func (b *s3Backend) storeModtime(fp string, meta map[string]string, val string) {
meta["X-Amz-Meta-Mtime"] = val
meta["mtime"] = val
b.meta.Store(fp, meta)
}
// TouchObject creates or updates meta on specified object. // TouchObject creates or updates meta on specified object.
func (b *s3Backend) TouchObject(ctx context.Context, fp string, meta map[string]string) (result gofakes3.PutObjectResult, err error) { func (b *s3Backend) TouchObject(ctx context.Context, fp string, meta map[string]string) (result gofakes3.PutObjectResult, err error) {
_, err = b.vfs.Stat(fp) _, err = b.vfs.Stat(fp)
@ -237,6 +245,7 @@ func (b *s3Backend) TouchObject(ctx context.Context, fp string, meta map[string]
if val, ok := meta["X-Amz-Meta-Mtime"]; ok { if val, ok := meta["X-Amz-Meta-Mtime"]; ok {
ti, err := swift.FloatStringToTime(val) ti, err := swift.FloatStringToTime(val)
if err == nil { if err == nil {
b.storeModtime(fp, meta, val)
return result, b.vfs.Chtimes(fp, ti, ti) return result, b.vfs.Chtimes(fp, ti, ti)
} }
// ignore error since the file is successfully created // ignore error since the file is successfully created
@ -245,6 +254,7 @@ func (b *s3Backend) TouchObject(ctx context.Context, fp string, meta map[string]
if val, ok := meta["mtime"]; ok { if val, ok := meta["mtime"]; ok {
ti, err := swift.FloatStringToTime(val) ti, err := swift.FloatStringToTime(val)
if err == nil { if err == nil {
b.storeModtime(fp, meta, val)
return result, b.vfs.Chtimes(fp, ti, ti) return result, b.vfs.Chtimes(fp, ti, ti)
} }
// ignore error since the file is successfully created // ignore error since the file is successfully created
@ -307,6 +317,7 @@ func (b *s3Backend) PutObject(
if val, ok := meta["X-Amz-Meta-Mtime"]; ok { if val, ok := meta["X-Amz-Meta-Mtime"]; ok {
ti, err := swift.FloatStringToTime(val) ti, err := swift.FloatStringToTime(val)
if err == nil { if err == nil {
b.storeModtime(fp, meta, val)
return result, b.vfs.Chtimes(fp, ti, ti) return result, b.vfs.Chtimes(fp, ti, ti)
} }
// ignore error since the file is successfully created // ignore error since the file is successfully created
@ -315,6 +326,7 @@ func (b *s3Backend) PutObject(
if val, ok := meta["mtime"]; ok { if val, ok := meta["mtime"]; ok {
ti, err := swift.FloatStringToTime(val) ti, err := swift.FloatStringToTime(val)
if err == nil { if err == nil {
b.storeModtime(fp, meta, val)
return result, b.vfs.Chtimes(fp, ti, ti) return result, b.vfs.Chtimes(fp, ti, ti)
} }
// ignore error since the file is successfully created // ignore error since the file is successfully created
@ -425,6 +437,7 @@ func (b *s3Backend) CopyObject(ctx context.Context, srcBucket, srcKey, dstBucket
if err != nil { if err != nil {
return result, nil return result, nil
} }
b.storeModtime(fp, meta, val)
return result, b.vfs.Chtimes(fp, ti, ti) return result, b.vfs.Chtimes(fp, ti, ti)
} }