Merge pull request from thaJeztah/23.0_backport_fix_volume_createdat

[23.0 backport] Fix volume CreatedAt being altered on initialization
This commit is contained in:
Sebastiaan van Stijn 2023-01-03 21:42:58 +01:00 committed by GitHub
commit cb13848acd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 2 deletions
integration/volume
volume/local

View file

@ -3,6 +3,7 @@ package volume
import (
"context"
"net/http"
"os"
"path/filepath"
"strings"
"testing"
@ -104,6 +105,21 @@ func TestVolumesInspect(t *testing.T) {
createdAt, err := time.Parse(time.RFC3339, strings.TrimSpace(inspected.CreatedAt))
assert.NilError(t, err)
assert.Check(t, createdAt.Unix()-now.Unix() < 60, "CreatedAt (%s) exceeds creation time (%s) 60s", createdAt, now)
// update atime and mtime for the "_data" directory (which would happen during volume initialization)
modifiedAt := time.Now().Local().Add(5 * time.Hour)
err = os.Chtimes(inspected.Mountpoint, modifiedAt, modifiedAt)
assert.NilError(t, err)
inspected, err = client.VolumeInspect(ctx, vol.Name)
assert.NilError(t, err)
createdAt2, err := time.Parse(time.RFC3339, strings.TrimSpace(inspected.CreatedAt))
assert.NilError(t, err)
// Check that CreatedAt didn't change after updating atime and mtime of the "_data" directory
// Related issue: #38274
assert.Equal(t, createdAt, createdAt2)
}
// TestVolumesInvalidJSON tests that POST endpoints that expect a body return

View file

@ -164,7 +164,7 @@ func (v *localVolume) unmount() error {
}
func (v *localVolume) CreatedAt() (time.Time, error) {
fileInfo, err := os.Stat(v.path)
fileInfo, err := os.Stat(v.rootPath)
if err != nil {
return time.Time{}, err
}

View file

@ -44,7 +44,7 @@ func (v *localVolume) postMount() error {
}
func (v *localVolume) CreatedAt() (time.Time, error) {
fileInfo, err := os.Stat(v.path)
fileInfo, err := os.Stat(v.rootPath)
if err != nil {
return time.Time{}, err
}