Merge pull request #8612 from sfayer/tidy_logdeletefrom

[int] Tidy up log entries using phrase 'delete from'

Author: fstagni

src/DIRAC/DataManagementSystem/Agent/RequestOperations/MoveReplica.py

@@ -112,7 +112,7 @@ def __call__(self):
                 # Do the replica removal
                 self.log.info("Removing files using Data manager...")
                 toRemoveDict = {opFile.LFN: opFile for opFile in waitingFiles}
-                self.log.info(f"todo: {len(toRemoveDict)} replicas to delete from {len(targetSEs)} sites")
+                self.log.info(f"todo: {len(toRemoveDict)} replicas to remove from {len(targetSEs)} sites")
                 self.dmRemoval(toRemoveDict, targetSEs)
 
         return S_OK()

src/DIRAC/DataManagementSystem/Agent/RequestOperations/RemoveReplica.py

@@ -77,7 +77,7 @@ def __call__(self):
         # # and prepare dict
         toRemoveDict = {opFile.LFN: opFile for opFile in waitingFiles}
 
-        self.log.info(f"Todo: {len(toRemoveDict)} replicas to delete from {len(targetSEs)} SEs")
+        self.log.info(f"Todo: {len(toRemoveDict)} replicas to remove from {len(targetSEs)} SEs")
 
         if self.rmsMonitoring:
             self.rmsMonitoringReporter.addRecord(self.createRMSRecord("Attempted", len(toRemoveDict)))

src/DIRAC/WorkloadManagementSystem/Client/JobState/JobState.py

@@ -292,7 +292,7 @@ def getOptParameters(self, nameList=None):
     def rescheduleJob(self, source=""):
         result = JobState.__db.tqDB.deleteJob(self.__jid)
         if not result["OK"]:
-            return S_ERROR(f"Cannot delete from TQ job {self.__jid}: {result['Message']}")
+            return S_ERROR(f"Cannot remove from TQ job {self.__jid}: {result['Message']}")
         result = JobState.__db.jobDB.rescheduleJob(self.__jid)
         if not result["OK"]:
             return S_ERROR(f"Cannot reschedule in JobDB job {self.__jid}: {result['Message']}")
@@ -309,7 +309,7 @@ def resetJob(self, source=""):
             return S_ERROR(f"Cannot set the RescheduleCounter for job {self.__jid}: {result['Message']}")
         result = JobState.__db.tqDB.deleteJob(self.__jid)
         if not result["OK"]:
-            return S_ERROR(f"Cannot delete from TQ job {self.__jid}: {result['Message']}")
+            return S_ERROR(f"Cannot remove from TQ job {self.__jid}: {result['Message']}")
         result = JobState.__db.jobDB.rescheduleJob(self.__jid)
         if not result["OK"]:
             return S_ERROR(f"Cannot reschedule in JobDB job {self.__jid}: {result['Message']}")

src/DIRAC/WorkloadManagementSystem/Service/OptimizationMindHandler.py

@@ -23,7 +23,7 @@ def cleanTaskQueues():
     for jid in result["Value"]:
         result = tqDB.deleteJob(jid)
         if not result["OK"]:
-            gLogger.error(f"Cannot delete from TQ job {jid}", result["Message"])
+            gLogger.error(f"Cannot remove from TQ job {jid}", result["Message"])
             continue
         result = jobDB.rescheduleJob(jid)
         if not result["OK"]: