TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in GetAndLockUnreplicatedObject query

Browse Source
This commit is contained in:
Neeraj Gupta
2024-08-12 21:36:49 +05:30
committed by Neeraj Gupta
parent f38d9deb11
commit ff72590958
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/pkg/controller/filedata/replicate.go
View File

@@ -63,7 +63,7 @@ func (c *Controller) tryReplicate() error {
row, err := c.Repo.GetPendingSyncDataAndExtendLock(ctx, newLockTime, false)
if err != nil {
if !errors.Is(err, sql.ErrNoRows) {
log.Errorf("Could not fetch row for deletion: %s", err)
log.Errorf("Could not fetch row for replication: %s", err)
}
return err
}

23
server/pkg/repo/object_copies.go
View File

@@ -35,13 +35,6 @@ func (repo *ObjectCopiesRepository) GetAndLockUnreplicatedObject() (*ente.Object
}
}
commit := func() {
cerr := tx.Commit()
if cerr != nil {
log.Errorf("Ignoring error when committing transaction: %s", cerr)
}
}
row := tx.QueryRow(`
SELECT object_key, want_b2, b2, want_wasabi, wasabi, want_scw, scw
FROM object_copies
@@ -59,20 +52,24 @@ func (repo *ObjectCopiesRepository) GetAndLockUnreplicatedObject() (*ente.Object
err = row.Scan(&r.ObjectKey, &r.WantB2, &r.B2, &r.WantWasabi, &r.Wasabi,
&r.WantSCW, &r.SCW)
if err != nil && errors.Is(err, sql.ErrNoRows) {
commit()
return nil, err
}
if err != nil {
rollback()
rollback() // Rollback transaction on any error
if errors.Is(err, sql.ErrNoRows) {
return nil, err // Return sql.ErrNoRows without committing the transaction
}
return nil, stacktrace.Propagate(err, "")
}
err = repo.RegisterReplicationAttempt(tx, r.ObjectKey)
if err != nil {
rollback()
return nil, stacktrace.Propagate(err, "failed to register replication attempt")
}
err = tx.Commit()
if err != nil {
return nil, stacktrace.Propagate(err, "")
}
return &r, nil
}