Enlarge WQE status mask && Add getWQElementsByWorkflow method && Shor…

…ten wowrflow status mask

src/python/WMComponent/WorkflowUpdater/SiteListPoller.py

@@ -31,7 +31,7 @@ def __init__(self, config):
         # get wmstats parameters
         self.wmstatsUrl = getattr(config.WorkflowUpdater, "wmstatsUrl")
         self.wmstatsSrv = WMStatsServer(self.wmstatsUrl, logger=self.logger)
-        self.states = getattr(config.WorkflowUpdater, "states", ['running-closed', 'running-open', 'acquired'])
+        self.states = getattr(config.WorkflowUpdater, "states", ['running-open', 'acquired'])
 
         # provide access to WMBS in local WMAgent
         self.daoFactory = DAOFactory(package="WMCore.WMBS",
@@ -131,7 +131,7 @@ def algorithm(self, parameters=None):
                 try:
                     # update local WorkQueue first
                     params = {'SiteWhitelist': siteWhiteList, 'SiteBlacklist': siteBlackList}
-                    self.localWQ.updateElementsByWorkflow(wHelper, params, status=['Available'])
+                    self.localWQ.updateElementsByWorkflow(wHelper, params, status=['Available', 'Negotiating', 'Acquired', 'Running'])
                     self.logger.info("successfully updated workqueue elements for workflow %s", wflow)
                 except Exception as ex:
                     logging.exception("Unexpected exception while updating elements in local workqueue Details:\n%s", str(ex))

src/python/WMCore/Services/WorkQueue/WorkQueue.py

@@ -326,6 +326,41 @@ def deleteWQElementsByWorkflow(self, workflowNames):
                 deleted += len(ids)
         return deleted
 
+    def getWQElementsByWorkflow(self, workflowNames, inboxFlag=False):
+        """
+        Get workqueue elements which belongs to a given workflow name(s)
+        :param workflowNames: The workflow name for which we try to fetch the WQE elemtns for (could be a list of names as well)
+        :param inboxFlag:     A flag to switch quering the inboxDB as well (default: False)
+        :returnt:             A dictionary with pairs of the type:
+                              {dbName1: [List of WQEs...],
+                               dbName2: [List of WQEs...]}
+        """
+        if inboxFlag:
+            couchdb = self.inboxDB
+        else:
+            couchdb = self.db
+
+        dbName = couchdb.info()['db_name']
+
+        if not isinstance(workflowNames, list):
+            workflowNames = [workflowNames]
+
+        options = {}
+        options["stale"] = "ok"
+        options["reduce"] = False
+
+        wqeList = {}
+        wqeList[dbName] = []
+        result = couchdb.loadView("WorkQueue", "elementsByWorkflow", options, workflowNames)
+
+        ids = []
+        for entry in result["rows"]:
+            ids.append(entry["id"])
+
+        for id in ids:
+            wqeList[dbName].append(couchdb.get(uri=f"/workqueue/_design/WorkQueue/_rewrite/element/{id}" ))
+        return wqeList
+
     def getElementsCountAndJobsByWorkflow(self, inboxFlag=False, stale=True):
         """Get the number of elements and jobs by status and workflow"""
         if inboxFlag: