Merge pull request #12063 from amaltaro/bundle-2341

Bundle of patches for WMAgent 2.3.4 series

src/python/WMCore/WMRuntime/Scripts/SetupCMSSWPset.py

@@ -11,7 +11,7 @@
 import os
 import pickle
 import socket
-
+from pprint import pformat
 from PSetTweaks.PSetTweak import PSetTweak
 from PSetTweaks.WMTweak import makeJobTweak, makeOutputTweak, makeTaskTweak, resizeResources
 from Utils.Utilities import decodeBytesToUnicode, encodeUnicodeToBytes
@@ -705,11 +705,10 @@ def __call__(self):
                 raise ex
 
         # Check process.source exists
-        self.logger.info("Debug: Self.process")
-        self.logger.info(dir(self.process))
         if getattr(self.process, "source", None) is None and getattr(self.process, "_Process__source", None) is None:
-            msg = "Error in CMSSW PSet: process is missing attribute 'source'"
-            msg += " or process.source is defined with None value."
+            msg = "Error in CMSSW PSet: process object is either missing or has "
+            msg += "None value for attributes 'source' and '_Process__source'. "
+            msg += f"Details of process object are: {pformat(dir(self.process))}"
             self.logger.error(msg)
             raise RuntimeError(msg)
 

src/python/WMCore/WorkQueue/WorkQueue.py

@@ -484,10 +484,14 @@ def _assignToChildQueue(self, queue, *elements):
             ele['WMBSUrl'] = self.params["WMBSUrl"]
             workByRequest.setdefault(ele['RequestName'], 0)
             workByRequest[ele['RequestName']] += 1
-        work = self.parent_queue.saveElements(*elements)
-        self.logger.info("Assigned work to the child queue for:")
-        for reqName, numElem in viewitems(workByRequest):
+        self.logger.info("Setting GQE status to 'Negotiating' and assigning to this child queue for:")
+        for reqName, numElem in workByRequest.items():
             self.logger.info("    %d elements for: %s", numElem, reqName)
+
+        work = self.parent_queue.saveElements(*elements)
+        self.logger.info("GQE successfully saved for:")
+        for ele in work:
+            self.logger.info("    %s under GQE id: %s", ele['RequestName'], ele.id)
         return work
 
     def doneWork(self, elementIDs=None, SubscriptionId=None, WorkflowName=None):

src/python/WMCore/WorkQueue/WorkQueueBackend.py

@@ -521,6 +521,10 @@ def _evalAvailableWork(self, listElems, thresholds, siteJobCounts,
             if element['RequestName'] in excludeWorkflows:
                 msg = "Skipping aborted/force-completed workflow: %s, work id: %s"
                 self.logger.info(msg, element['RequestName'], element._id)
+            elif element['Status'] != 'Available':
+                # Extra safety mechanism, see https://github.com/dmwm/WMCore/pull/12050
+                msg = "Skipping element in unwanted status: %s, work id: %s"
+                self.logger.warning(msg, element['Status'], element._id)
             else:
                 sortedElements.append(element)
         sortAvailableElements(sortedElements)