From 8186246690f42cdff74103619bd11b648c36648a Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <neeraj.gupta983@gmail.com>
Date: Thu, 7 Mar 2024 13:08:04 +0530
Subject: [PATCH] [server] Update freq for removing compliance hold (#731)

## Description
- Taking lock at host level to avoid redundant downstream request when
multiple host pick same items.

## Tests
Tested locally.
---
 server/cmd/museum/main.go       |  2 +-
 server/pkg/controller/object.go | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index cb684499db..fb5b36fdb8 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -860,7 +860,7 @@ func setupAndStartCrons(userAuthRepo *repo.UserAuthRepository, publicCollectionR
 		trashController.DropFileMetadataCron()
 	})
 
-	schedule(c, "@every 2m", func() {
+	schedule(c, "@every 90s", func() {
 		objectController.RemoveComplianceHolds()
 	})
 
diff --git a/server/pkg/controller/object.go b/server/pkg/controller/object.go
index 8f197fe46a..6ae93f192b 100644
--- a/server/pkg/controller/object.go
+++ b/server/pkg/controller/object.go
@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"fmt"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/ente-io/museum/pkg/controller/lock"
@@ -30,6 +31,10 @@ type ObjectController struct {
 	complianceCronRunning bool
 }
 
+const (
+	RemoveComplianceHoldsLock = "remove_compliance_holds_lock"
+)
+
 // RemoveComplianceHolds removes the Wasabi compliance hold from objects in
 // Wasabi for files which have been deleted.
 //
@@ -41,7 +46,6 @@ func (c *ObjectController) RemoveComplianceHolds() {
 		// Wasabi compliance is currently disabled in config, nothing to do.
 		return
 	}
-
 	if c.complianceCronRunning {
 		log.Info("Skipping RemoveComplianceHolds cron run as another instance is still running")
 		return
@@ -51,7 +55,16 @@ func (c *ObjectController) RemoveComplianceHolds() {
 		c.complianceCronRunning = false
 	}()
 
-	items, err := c.QueueRepo.GetItemsReadyForDeletion(repo.RemoveComplianceHoldQueue, 200)
+	lockStatus := c.LockController.TryLock(RemoveComplianceHoldsLock, time.MicrosecondsAfterHours(24))
+	if !lockStatus {
+		log.Warning(fmt.Sprintf("Failed to acquire lock %s", RemoveComplianceHoldsLock))
+		return
+	}
+	defer func() {
+		c.LockController.ReleaseLock(RemoveComplianceHoldsLock)
+	}()
+
+	items, err := c.QueueRepo.GetItemsReadyForDeletion(repo.RemoveComplianceHoldQueue, 1000)
 	if err != nil {
 		log.WithError(err).Error("Failed to fetch items from queue")
 		return
@@ -62,7 +75,7 @@ func (c *ObjectController) RemoveComplianceHolds() {
 		c.removeComplianceHold(i)
 	}
 
-	log.Infof("Revmoed compliance holds on %d deleted files", len(items))
+	log.Infof("Removed compliance holds on %d deleted files", len(items))
 }
 
 func (c *ObjectController) removeComplianceHold(qItem repo.QueueItem) {