Merge pull request #4936 from butonic/no-delete-lock

do not delete mlock files after update
cs3org · Nov 19, 2024 · a57d65d · a57d65d
2 parents d341028 + 9b523db
commit a57d65d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/changelog/unreleased/no-delete-lock.md b/changelog/unreleased/no-delete-lock.md
@@ -0,0 +1,6 @@
+Bugfix: Do not delete mlock files
+
+To prevent stale NFS file handles we no longer delete empty mlock files after updating the metadata.
+
+https://github.com/cs3org/reva/pull/4936
+https://github.com/cs3org/reva/pull/4924
diff --git a/pkg/storage/utils/decomposedfs/upload/store.go b/pkg/storage/utils/decomposedfs/upload/store.go
@@ -312,11 +312,8 @@ func (store OcisStore) updateExistingNode(ctx context.Context, session *OcisSess
 	}
 
 	unlock := func() error {
-		err := f.Close()
-		if err != nil {
-			return err
-		}
-		return os.Remove(store.lu.MetadataBackend().LockfilePath(targetPath))
+		// NOTE: to prevent stale NFS file handles do not remove lock file!
+		return f.Close()
 	}
 
 	old, _ := node.ReadNode(ctx, store.lu, spaceID, n.ID, false, nil, false)