Prevent the posixfs assimilation to change explicitly set upload mtimes

aduffeck · Aug 2, 2024 · 054eb2d · 054eb2d
1 parent a81d6f9
commit 054eb2d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/pkg/storage/fs/posix/tree/assimilation.go b/pkg/storage/fs/posix/tree/assimilation.go
@@ -477,10 +477,17 @@ assimilate:
 		prefixes.IDAttr:   []byte(id),
 		prefixes.NameAttr: []byte(filepath.Base(path)),
 	}
-	prevMtime, err := previousAttribs.Time(prefixes.MTimeAttr)
-	if err != nil || prevMtime.Before(fi.ModTime()) {
-		attributes[prefixes.MTimeAttr] = []byte(fi.ModTime().Format(time.RFC3339Nano))
+
+	freezeMtime, err := previousAttribs.Time(prefixes.FreezeMTimeUntilAttr)
+	if err != nil || time.Now().After(freezeMtime) {
+		if prevMtime, err := previousAttribs.Time(prefixes.MTimeAttr); err != nil || prevMtime.Before(fi.ModTime()) {
+			attributes.SetString(prefixes.MTimeAttr, fi.ModTime().Format(time.RFC3339Nano))
+		}
 	}
+	if err == nil && time.Now().After(freezeMtime) {
+		_ = t.lookup.MetadataBackend().Remove(context.Background(), path, prefixes.FreezeMTimeUntilAttr, false)
+	}
+
 	if len(parentID) > 0 {
 		attributes[prefixes.ParentidAttr] = []byte(parentID)
 	}

diff --git a/pkg/storage/utils/decomposedfs/metadata/prefixes/prefixes.go b/pkg/storage/utils/decomposedfs/metadata/prefixes/prefixes.go
@@ -100,4 +100,9 @@ const (
 
 	UserAcePrefix  string = "u:"
 	GroupAcePrefix string = "g:"
+
+	// temporary attributes for internal use:
+
+	// Do not update the mtime until this time
+	FreezeMTimeUntilAttr string = OcisPrefix + "freezemtimeuntil"
 )
diff --git a/pkg/storage/utils/decomposedfs/upload/store.go b/pkg/storage/utils/decomposedfs/upload/store.go
@@ -259,6 +259,7 @@ func (store OcisStore) CreateNodeForUpload(session *OcisSession, initAttrs node.
 	if !session.MTime().IsZero() {
 		// overwrite mtime if requested
 		mtime = session.MTime()
+		initAttrs.SetString(prefixes.FreezeMTimeUntilAttr, time.Now().Add(1*time.Minute).Format(time.RFC3339Nano))
 	}
 
 	// overwrite technical information