Merge pull request #8189 from chrisburr/sandbox-store-cleaning

fstagni · web-flow · commit fa4331819320 · 2025-05-09T16:21:19.000+02:00
[9.0] Don't clean sandboxes which are on S3
diff --git a/src/DIRAC/WorkloadManagementSystem/DB/SandboxMetadataDB.py b/src/DIRAC/WorkloadManagementSystem/DB/SandboxMetadataDB.py
@@ -309,7 +309,8 @@ def getUnusedSandboxes(self):
             "TIMESTAMPDIFF( DAY, LastAccessTime, UTC_TIMESTAMP() ) >= %d" % self.__assignedSBGraceDays,
             f"! Assigned AND TIMESTAMPDIFF( DAY, LastAccessTime, UTC_TIMESTAMP() ) >= {self.__unassignedSBGraceDays}",
         ]
-        sqlCmd = f"SELECT SBId, SEName, SEPFN FROM `sb_SandBoxes` WHERE ( {' ) OR ( '.join(sqlCond)} )"
+        # Exclude sandboxes that are in S3 as those are handled by DiracX
+        sqlCmd = f"SELECT SBId, SEName, SEPFN FROM `sb_SandBoxes` WHERE SEPFN not like '/S3/%' AND (( {' ) OR ( '.join(sqlCond)} ))"
         return self._query(sqlCmd)
 
     def deleteSandboxes(self, SBIdList):

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,8 @@ def getUnusedSandboxes(self):`
`309`	`309`	`"TIMESTAMPDIFF( DAY, LastAccessTime, UTC_TIMESTAMP() ) >= %d" % self.__assignedSBGraceDays,`
`310`	`310`	`f"! Assigned AND TIMESTAMPDIFF( DAY, LastAccessTime, UTC_TIMESTAMP() ) >= {self.__unassignedSBGraceDays}",`
`311`	`311`	`]`
`312`		- sqlCmd = f"SELECT SBId, SEName, SEPFN FROM `sb_SandBoxes` WHERE ( {' ) OR ( '.join(sqlCond)} )"
	`312`	`+ # Exclude sandboxes that are in S3 as those are handled by DiracX`
	`313`	+ sqlCmd = f"SELECT SBId, SEName, SEPFN FROM `sb_SandBoxes` WHERE SEPFN not like '/S3/%' AND (( {' ) OR ( '.join(sqlCond)} ))"
`313`	`314`	`return self._query(sqlCmd)`
`314`	`315`
`315`	`316`	`def deleteSandboxes(self, SBIdList):`