Merge pull request #12095 from amaltaro/bundle-2344

Bundle of patches for WMAgent 2.3.4.4
dmwm · Sep 11, 2024 · 9c7d821 · 9c7d821
2 parents 34a4fde + 6f2665b
commit 9c7d821
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/src/python/WMComponent/JobAccountant/AccountantWorker.py b/src/python/WMComponent/JobAccountant/AccountantWorker.py
@@ -495,19 +495,16 @@ def handleJob(self, jobID, fwkJobReport):
         else:
             fileList = fwkJobReport.getAllFilesFromStep(step='logArch1')
 
-        # Make sure every file has a valid location
-        # see https://github.com/dmwm/WMCore/issues/9353
-        newList = []
+        # Workaround: make sure every file has a valid location. See:
+        # https://github.com/dmwm/WMCore/issues/9353 and https://github.com/dmwm/WMCore/issues/12092
         for fwjrFile in fileList:
             # T0 has analysis file without any location, see:
             # https://github.com/dmwm/WMCore/issues/9497
             if not fwjrFile.get("locations") and fwjrFile.get("lfn", "").endswith(".root"):
                 logging.warning("The following file does not have any location: %s", fwjrFile)
                 jobSuccess = False
-            else:
-                newList.append(fwjrFile)
-        # save the new list free of ill files (without any location)
-        fileList = newList
+                fileList = fwkJobReport.getAllFilesFromStep(step='logArch1')
+                break
 
         if jobSuccess:
             logging.info("Job %d , handle successful job", jobID)

diff --git a/src/python/WMCore/WorkQueue/Policy/Start/StartPolicyInterface.py b/src/python/WMCore/WorkQueue/Policy/Start/StartPolicyInterface.py
@@ -294,7 +294,7 @@ def getDatasetLocationsFromMSPileup(self, datasetsWithDbsURL):
                     self.logger.debug(f'Retrieved MSPileup document: {doc}')
                     if len(currentRSEs) == 0:
                         self.logger.warning(f'No RSE has a copy of the desired pileup dataset. Expected RSEs: {doc["expectedRSEs"]}')  
-                    result[dataset] = doc['currentRSEs']
+                    result[dataset] = currentRSEs
                 except IndexError:
                     self.logger.warning('Did not find any pileup document for query: %s', queryDict['query'])
                     result[dataset] = []