kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-08-13 09:47:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle deletion from inFlight replica

Browse Source
This commit is contained in:
Neeraj Gupta
2024-08-07 16:46:02 +05:30
parent 5f14057b65
commit 1bb4940e14
3 changed files with 83 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/pkg/controller/filedata/delete.go
View File

@@ -5,6 +5,7 @@ import (
"fmt"
"github.com/ente-io/museum/ente/filedata"
"github.com/ente-io/museum/pkg/repo"
fileDataRepo "github.com/ente-io/museum/pkg/repo/filedata"
"github.com/ente-io/museum/pkg/utils/time"
log "github.com/sirupsen/logrus"
"strconv"
@@ -70,7 +71,7 @@ func (c *Controller) deleteFileData(qItem repo.QueueItem) {
return
}
}
dbErr := c.Repo.RemoveBucketFromDeletedBuckets(fileDataRow, bucketID)
dbErr := c.Repo.RemoveBucket(fileDataRow, bucketID, fileDataRepo.DeletionColumn)
if dbErr != nil {
ctxLogger.WithError(dbErr).Error("Failed to remove from db")
return
@@ -86,7 +87,7 @@ func (c *Controller) deleteFileData(qItem repo.QueueItem) {
return
}
}
dbErr := c.Repo.RemoveBucketFromReplicatedBuckets(fileDataRow, bucketID)
dbErr := c.Repo.RemoveBucket(fileDataRow, bucketID, fileDataRepo.ReplicationColumn)
if dbErr != nil {
ctxLogger.WithError(dbErr).Error("Failed to remove from db")
return
@@ -100,7 +101,7 @@ func (c *Controller) deleteFileData(qItem repo.QueueItem) {
return
}
}
dbErr := c.Repo.DeleteFileData(context.Background(), fileDataRow.FileID, fileDataRow.Type, fileDataRow.LatestBucket)
dbErr := c.Repo.DeleteFileData(context.Background(), fileDataRow)
if dbErr != nil {
ctxLogger.WithError(dbErr).Error("Failed to remove from db")
return