1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index cc5c58f02a..bc7ca34efe 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -180,7 +180,7 @@ func main() {
legacyKitRepository := &legacykitrepo.Repository{DB: db}
notificationHistoryRepo := &repo.NotificationHistoryRepository{DB: db}
- queueRepo := &repo.QueueRepository{DB: db}
+ queueRepo := &repo.QueueRepository{DB: db, DeleteObjectDelay: viper.GetString("internal.delete-object-delay")}
objectRepo := &repo.ObjectRepository{DB: db, QueueRepo: queueRepo}
objectCleanupRepo := &repo.ObjectCleanupRepository{DB: db}
contactRepository := &contactRepo.Repository{
diff --git a/server/pkg/repo/queue.go b/server/pkg/repo/queue.go
index cd082885b9..2794e59ac7 100644
--- a/server/pkg/repo/queue.go
+++ b/server/pkg/repo/queue.go
@@ -15,18 +15,7 @@ import (
// QueueRepository defines methods to insert, delete items from queue
type QueueRepository struct {
DB *sql.DB
-}
-
-// itemDeletionDelayInMinMap tracks the delay (in min) after which an item is ready to be processed.
-// -ve entry indicates that the item should be processed immediately, without any delay.
-var itemDeletionDelayInMinMap = map[string]int64{
- DropFileEncMedataQueue: -1 * 24 * 60, // -ve value to ensure attributes are immediately removed
- DeleteObjectQueue: 45 * 24 * 60, // 45 days in minutes
- DeleteEmbeddingsQueue: -1 * 24 * 60, // -ve value to ensure embeddings are immediately removed
- TrashCollectionQueueV3: -1 * 24 * 60, // -ve value to ensure collections are immediately marked as trashed
- TrashEmptyQueue: -1 * 24 * 60, // -ve value to ensure empty trash request are processed in next cron run
- TrashEmptyLockerQueue: -1 * 24 * 60, // -ve value to ensure empty trash request for locker are processed in next cron run
- RemoveComplianceHoldQueue: -1 * 24 * 60, // -ve value to ensure compliance hold is removed in next cron run
+ DeleteObjectDelay string
}
const (
@@ -126,8 +115,29 @@ func (repo *QueueRepository) DeleteItem(queueName string, item string) error {
return stacktrace.Propagate(err, "")
}
+func getDeleteObjectDelayInt(DeleteObjectDelay *string) int64 {
+ DeleteObjectDelayInt, err := strconv.ParseInt(*DeleteObjectDelay, 10, 64)
+ if err != nil || DeleteObjectDelayInt == 0 {
+ DeleteObjectDelayInt = 45 * 24 * 60 // defaults to 45 days in minutes
+ }
+ logrus.Debugf("DeleteObjectDelay: %d minutes", DeleteObjectDelayInt)
+ return DeleteObjectDelayInt
+}
+
// GetItemsReadyForDeletion method, for a given queue name, returns a list of QueueItem which are ready for deletion
func (repo *QueueRepository) GetItemsReadyForDeletion(queueName string, count int) ([]QueueItem, error) {
+ // itemDeletionDelayInMinMap tracks the delay (in min) after which an item is ready to be processed.
+ // -ve entry indicates that the item should be processed immediately, without any delay.
+ var itemDeletionDelayInMinMap = map[string]int64{
+ DropFileEncMedataQueue: -1 * 24 * 60, // -ve value to ensure attributes are immediately removed
+ DeleteObjectQueue: getDeleteObjectDelayInt(&repo.DeleteObjectDelay),
+ DeleteEmbeddingsQueue: -1 * 24 * 60, // -ve value to ensure embeddings are immediately removed
+ TrashCollectionQueueV3: -1 * 24 * 60, // -ve value to ensure collections are immediately marked as trashed
+ TrashEmptyQueue: -1 * 24 * 60, // -ve value to ensure empty trash request are processed in next cron run
+ TrashEmptyLockerQueue: -1 * 24 * 60, // -ve value to ensure empty trash request for locker are processed in next cron run
+ RemoveComplianceHoldQueue: -1 * 24 * 60, // -ve value to ensure compliance hold is removed in next cron run
+ }
+
delayInMin, ok := itemDeletionDelayInMinMap[queueName]
if !ok {
return nil, stacktrace.Propagate(fmt.Errorf("missing delay for %s", queueName), "")
|