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

[server] Minor refactor

Browse Source
This commit is contained in:
Neeraj Gupta
2024-10-03 21:37:09 +05:30
parent 4f963f250f
commit 2430473a10
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,10 +98,15 @@ func (c *Controller) replicateRowData(ctx context.Context, row filedata.Row) err
if err != nil {
return stacktrace.Propagate(err, "error fetching metadata object "+row.S3FileMetadataObjectKey())
}
for bucketID := range wantInBucketIDs {
for key := range wantInBucketIDs {
bucketID := key
if regErr := c.Repo.RegisterReplicationAttempt(ctx, row, bucketID); regErr != nil {
return stacktrace.Propagate(regErr, "could not register replication attempt")
}
if err := c.uploadAndVerify(ctx, row, s3FileMetadata, bucketID); err != nil {
return stacktrace.Propagate(err, "error uploading and verifying metadata object")
}
return c.Repo.MoveBetweenBuckets(row, bucketID, fileDataRepo.InflightRepColumn, fileDataRepo.ReplicationColumn)
}
} else {
log.Infof("No replication pending for file %d and type %s", row.FileID, string(row.Type))
@@ -110,9 +115,6 @@ func (c *Controller) replicateRowData(ctx context.Context, row filedata.Row) err
}
func (c *Controller) uploadAndVerify(ctx context.Context, row filedata.Row, s3FileMetadata filedata.S3FileMetadata, dstBucketID string) error {
if err := c.Repo.RegisterReplicationAttempt(ctx, row, dstBucketID); err != nil {
return stacktrace.Propagate(err, "could not register replication attempt")
}
metadataSize, err := c.uploadObject(s3FileMetadata, row.S3FileMetadataObjectKey(), dstBucketID)
if err != nil {
return err
@@ -120,5 +122,5 @@ func (c *Controller) uploadAndVerify(ctx context.Context, row filedata.Row, s3Fi
if metadataSize != row.Size {
return fmt.Errorf("uploaded metadata size %d does not match expected size %d", metadataSize, row.Size)
}
return c.Repo.MoveBetweenBuckets(row, dstBucketID, fileDataRepo.InflightRepColumn, fileDataRepo.ReplicationColumn)
return nil
}