Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Preserve membership lock order during restore

Neeraj Gupta3bb661bd8836
diff --git a/server/pkg/repo/collection.go b/server/pkg/repo/collection.go
index ad7a358d65..a5551923c7 100644
--- a/server/pkg/repo/collection.go
+++ b/server/pkg/repo/collection.go
@@ -786,15 +786,6 @@ func (repo *CollectionRepository) RestoreFiles(ctx context.Context, userID int64
if !canRestoreAllFiles {
return stacktrace.Propagate(ente.ErrBadRequest, "some fileIDs are not restorable")
}
- var app ente.App
- if err := tx.QueryRowContext(ctx, `SELECT app FROM collections
- WHERE collection_id = $1 AND owner_id = $2 AND is_deleted = FALSE
- FOR UPDATE`, collectionID, userID).Scan(&app); err != nil {
- if errors.Is(err, sql.ErrNoRows) {
- return stacktrace.Propagate(ente.ErrPermissionDenied, "restore destination is not an active owned collection")
- }
- return stacktrace.Propagate(err, "")
- }
filesBecomingActive, err := inactiveOwnedFileCount(ctx, tx, userID, fileIDs)
if err != nil {
return stacktrace.Propagate(err, "failed to calculate file count transition")
@@ -803,9 +794,14 @@ func (repo *CollectionRepository) RestoreFiles(ctx context.Context, userID int64
if err := upsertCollectionFiles(ctx, tx, collectionID, userID, newCollectionFiles, userID, updationTime); err != nil {
return stacktrace.Propagate(err, "")
}
- _, err = tx.ExecContext(ctx, `UPDATE collections SET updation_time = $1
- WHERE collection_id = $2`, updationTime, collectionID)
- if err != nil {
+ // Match SuggestAction's membership-before-collection lock order.
+ var app ente.App
+ if err := tx.QueryRowContext(ctx, `UPDATE collections SET updation_time = $1
+ WHERE collection_id = $2 AND owner_id = $3 AND is_deleted = FALSE
+ RETURNING app`, updationTime, collectionID, userID).Scan(&app); err != nil {
+ if errors.Is(err, sql.ErrNoRows) {
+ return stacktrace.Propagate(ente.ErrPermissionDenied, "restore destination is not an active owned collection")
+ }
return stacktrace.Propagate(err, "")
}
diff --git a/server/pkg/repo/collection_memberships_test.go b/server/pkg/repo/collection_memberships_test.go
index b6bd31f448..5edc5d18a2 100644
--- a/server/pkg/repo/collection_memberships_test.go
+++ b/server/pkg/repo/collection_memberships_test.go
@@ -296,6 +296,72 @@ func TestRestoreFilesUpsertsBatchAndMarksTrashRestored(t *testing.T) {
}
}
+func TestRestoreFilesPreservesMembershipBeforeCollectionLockOrder(t *testing.T) {
+ repository, db, ownerID := setupCollectionMembershipTest(t)
+ collectionID := insertObjectTestCollection(t, db, ownerID)
+ fileID := insertObjectTestFile(t, db, ownerID)
+ linkObjectTestFileToCollection(t, db, collectionID, fileID, ownerID)
+ setReadyFileCounts(t, db, ownerID, 1, 0)
+ repository.TrashRepo.FileLinkRepo = public.NewFileLinkRepo(db)
+ if err := repository.TrashRepo.TrashFiles(t.Context(), ownerID, ente.TrashRequest{
+ TrashItems: []ente.TrashItemRequest{{FileID: fileID, CollectionID: collectionID}},
+ }); err != nil {
+ t.Fatal(err)
+ }
+
+ ctx, cancel := context.WithTimeout(t.Context(), 10*time.Second)
+ defer cancel()
+ suggestion, err := db.BeginTx(ctx, nil)
+ if err != nil {
+ t.Fatal(err)
+ }
+ defer suggestion.Rollback()
+ var suggestionPID int
+ if err := suggestion.QueryRowContext(ctx, `SELECT pg_backend_pid()`).Scan(&suggestionPID); err != nil {
+ t.Fatal(err)
+ }
+ // A SuggestAction request can pass validation before Trash, then update the
+ // membership after Trash commits. It takes no file lock.
+ if _, err := suggestion.ExecContext(ctx, `UPDATE collection_files SET action = $1
+ WHERE collection_id = $2 AND file_id = $3`, ente.ActionRemove, collectionID, fileID); err != nil {
+ t.Fatal(err)
+ }
+ restoreResult := make(chan error, 1)
+ go func() {
+ restoreResult <- repository.RestoreFiles(ctx, ownerID, collectionID,
+ []ente.CollectionFileItem{collectionMembershipTestItem(fileID)})
+ }()
+ for {
+ var waiting bool
+ if err := db.QueryRowContext(ctx, `SELECT EXISTS (
+ SELECT 1 FROM pg_stat_activity WHERE datname = current_database()
+ AND $1 = ANY(pg_blocking_pids(pid))
+ )`, suggestionPID).Scan(&waiting); err != nil {
+ t.Fatal(err)
+ }
+ if waiting {
+ break
+ }
+ time.Sleep(10 * time.Millisecond)
+ }
+ // Restore is waiting for our membership row. Taking the collection lock
+ // must succeed, allowing SuggestAction to finish and unblock Restore.
+ if _, err := suggestion.ExecContext(ctx, `UPDATE collections SET updation_time = $1
+ WHERE collection_id = $2`, time.Now().UnixMicro(), collectionID); err != nil {
+ t.Fatal(err)
+ }
+ if err := suggestion.Commit(); err != nil {
+ t.Fatal(err)
+ }
+ if err := <-restoreResult; err != nil {
+ t.Fatalf("RestoreFiles() error = %v", err)
+ }
+ if state := readCollectionMembershipState(t, db, collectionID, fileID); state.isDeleted || state.action.Valid {
+ t.Fatalf("restored membership retained deleted or suggested-removal state: %+v", state)
+ }
+ assertReadyFileCounts(t, db, ownerID, 1, 0, 2)
+}
+
func TestRestoreFilesAndDeleteSerializeOnFile(t *testing.T) {
repository, db, ownerID := setupCollectionMembershipTest(t)
collectionID := insertObjectTestCollection(t, db, ownerID)