reqmgr2ms-monitor 2.3.7.1__tar.gz → 2.3.8rc6__tar.gz

{reqmgr2ms-monitor-2.3.7.1/src/python/reqmgr2ms_monitor.egg-info → reqmgr2ms-monitor-2.3.8rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-monitor
-Version: 2.3.7.1
+Version: 2.3.8rc6
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group

{reqmgr2ms-monitor-2.3.7.1 → reqmgr2ms-monitor-2.3.8rc6}/bin/adhoc-scripts/drainAgent.py

@@ -202,7 +202,7 @@ def getCondorJobs():
     """
     jobDict = {}
     schedd = condor.Schedd()
-    jobs = schedd.xquery('WMAgent_AgentName == "WMAgent"', ['WMAgent_RequestName', 'JobStatus'])
+    jobs = schedd.query('WMAgent_AgentName == "WMAgent"', ['WMAgent_RequestName', 'JobStatus'])
     for job in jobs:
         jobStatus = job['JobStatus']
         jobDict.setdefault(jobStatus, {})

{reqmgr2ms-monitor-2.3.7.1 → reqmgr2ms-monitor-2.3.8rc6}/src/python/WMCore/ReqMgr/DataStructs/RequestStatus.py

@@ -128,10 +128,10 @@ ALLOWED_ACTIONS_FOR_STATUS = {
                             "NonCustodialSites", "Override",
                             "SubscriptionPriority"],
     "assigned": ["RequestPriority"],
-    "staging": ["RequestPriority"],
+    "staging": ["RequestPriority", "SiteWhitelist", "SiteBlacklist"],
     "staged": ["RequestPriority"],
-    "acquired": ["RequestPriority"],
-    "running-open": ["RequestPriority"],
+    "acquired": ["RequestPriority", "SiteWhitelist", "SiteBlacklist"],
+    "running-open": ["RequestPriority", "SiteWhitelist", "SiteBlacklist"],
     "running-closed": ["RequestPriority"],
     "failed": [],
     "force-complete": [],
@@ -146,6 +146,18 @@ ALLOWED_ACTIONS_FOR_STATUS = {
     "rejected-archived": [],
 }
 
+# NOTE: We need to Explicitly add RequestStatus to reqArgsDiff, since it is
+#       missing from the ALLOWED_ACTIONS_FOR_STATUS mapping. The alternative
+#       would be to add it as allowed action to every state.
+#       The same applies to few more, such as all the keys needed for the
+#       workqueue_stat_validation() calls, but we do this only during
+#       request parameters validation.
+ALLOWED_ACTIONS_ALL_STATUS = ["RequestStatus"]
+
+# NOTE: We need to explicitly add all stat keys during validation
+#       They are needed for the workqueue_stat_validation() calls
+ALLOWED_STAT_KEYS = ['total_jobs', 'input_lumis', 'input_events', 'input_num_files']
+
 # Workflow state transition automatically controlled by ReqMgr2
 ### NOTE: order of this list matters and it's used for status transition
 AUTO_TRANSITION = {"staged": ["acquired", "running-open", "running-closed", "completed"],
@@ -184,7 +196,8 @@ def get_modifiable_properties(status=None):
     TODO: Currently gets the result from hardcoded list. change to get from configuration or db
     """
     if status:
-        return ALLOWED_ACTIONS_FOR_STATUS.get(status, 'all_attributes')
+        allowedKeys = ALLOWED_ACTIONS_FOR_STATUS.get(status, 'all_attributes')
+        return allowedKeys
     else:
         return ALLOWED_ACTIONS_FOR_STATUS
 

{reqmgr2ms-monitor-2.3.7.1 → reqmgr2ms-monitor-2.3.8rc6}/src/python/WMCore/Services/PyCondor/PyCondorAPI.py

@@ -37,7 +37,6 @@ class PyCondorAPI(object):
         Retrieves a job summary from the HTCondor Schedd object
         :return: a list of classads representing the matching jobs, or None if failed
         """
-        ### NOTE: SummaryOnly does not work with xquery method
         jobs = None  # return None to signalize the query failed
         queryOpts = htcondor.htcondor.QueryOpts.SummaryOnly
         try:
@@ -68,12 +67,12 @@ class PyCondorAPI(object):
         msg = "Querying condor schedd with params: constraint=%s, attrList=%s, limit=%s, opts=%s"
         logging.info(msg, constraint, attrList, limit, opts)
         try:
-            return self.schedd.xquery(constraint, attrList, limit, opts=opts)
+            return self.schedd.query(constraint, attrList, limit, opts=opts)
         except Exception:
             self.recreateSchedd()
 
         # if we hit another exception, let it be raised up in the chain
-        return self.schedd.xquery(constraint, attrList, limit, opts=opts)
+        return self.schedd.query(constraint, attrList, limit, opts=opts)
 
     def editCondorJobs(self, job_spec, attr, value):
         """

{reqmgr2ms-monitor-2.3.7.1 → reqmgr2ms-monitor-2.3.8rc6}/src/python/WMCore/__init__.py

@@ -6,5 +6,5 @@ Core libraries for Workload Management Packages
 
 """
 
-__version__ = '2.3.7.1'
+__version__ = '2.3.8rc6'
 __all__ = []

{reqmgr2ms-monitor-2.3.7.1 → reqmgr2ms-monitor-2.3.8rc6/src/python/reqmgr2ms_monitor.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-monitor
-Version: 2.3.7.1
+Version: 2.3.8rc6
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group