reqmgr2ms-output 2.3.6rc7__tar.gz → 2.3.7__tar.gz

{reqmgr2ms-output-2.3.6rc7/src/python/reqmgr2ms_output.egg-info → reqmgr2ms-output-2.3.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-output
-Version: 2.3.6rc7
+Version: 2.3.7
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.7}/bin/patchComponent.sh

@@ -19,7 +19,7 @@ patchNum=$1
 shift
 
 [[ -z $patchNum ]] && patchNum=temp
-echo "Patching WMCore code with PR: $pathcNum"
+echo "Patching WMCore code with PR: $patchNum"
 
 currTag=$(python -c "from WMCore import __version__ as WMCoreVersion; print(WMCoreVersion)")
 echo "Current WMCoreTag: $currTag"
@@ -63,7 +63,7 @@ do
     echo dest: $pythonLibPath/$file
     curl -f https://raw.githubusercontent.com/dmwm/WMCore/$currTag/src/python/$file  -o $pythonLibPath/$file || { \
         echo file: $file missing at the origin.
-        echo Seems to be a new file for the curren patch.
+        echo Seems to be a new file for the current patch.
         echo Removing it from the destination as well!
         rm -f $pythonLibPath/$file
     }

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.7}/src/python/Utils/Utilities.py

@@ -99,7 +99,9 @@ def diskUse():
     for x in output:
         split = x.split()
         if split != [] and split[0] != 'Filesystem':
-            diskPercent.append({'mounted': split[5], 'percent': split[4]})
+            diskPercent.append({'filesystem': split[0],
+                                'mounted':    split[5], 
+                                'percent':    split[4]})
 
     return diskPercent
 

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.7}/src/python/WMCore/Database/CMSCouch.py

@@ -1016,7 +1016,7 @@ class CouchServer(CouchDBRequests):
 
     def replicate(self, source, destination, continuous=False,
                   create_target=False, cancel=False, doc_ids=False,
-                  filter=False, query_params=False, sleepSecs=0):
+                  filter=False, query_params=False, sleepSecs=0, selector=False):
         """
         Trigger replication between source and destination. CouchDB options are
         defined in: https://docs.couchdb.org/en/3.1.2/api/server/common.html#replicate
@@ -1039,6 +1039,7 @@ class CouchServer(CouchDBRequests):
                        this filter is expected to have been defined in the design doc.
         :param query_params: dictionary of parameters to pass over to the filter function
         :param sleepSecs: amount of seconds to sleep after the replication job is created
+        :param selector: a new'ish feature for filter functions in Erlang
         :return: status of the replication creation
         """
         listDbs = self.listDatabases()
@@ -1064,6 +1065,8 @@ class CouchServer(CouchDBRequests):
             data["filter"] = filter
             if query_params:
                 data["query_params"] = query_params
+        if selector: data["selector"] = selector
+
         resp = self.post('/_replicator', data)
         # Sleep required for CouchDB 3.x unit tests
         time.sleep(sleepSecs)

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.7}/src/python/WMCore/MicroService/MSOutput/MSOutput.py

@@ -705,8 +705,8 @@ class MSOutput(MSCore):
 
         # if there were containers not found in Rucio, create an email alert
         if notFoundDIDs:
-            # log and send alert via AlertManager API
-            self.alertDIDNotFound(msOutDoc["RequestName"], notFoundDIDs)
+            # only log warning msg, the previous alerts to AlertManager were too noisy
+            self.logDIDNotFound(msOutDoc["RequestName"], notFoundDIDs)
 
         try:
             msOutDoc.updateDoc({"OutputMap": updatedOutputMap}, throw=True)
@@ -975,23 +975,19 @@ class MSOutput(MSCore):
         """
         return doc.clear()
 
-    def alertDIDNotFound(self, wflowName, containerList):
+    def logDIDNotFound(self, wflowName, containerList):
         """
-        Send an alert to Prometheus for output containers not found within
+        Log a warning message for output containers not found within
         a given workflow.
         :param wflowName: string with the workflow name
         :param containerList: list of container names
         :return: none
         """
-        alertName = "ms-output: output containers not found for workflow: {}".format(wflowName)
-        alertSeverity = "high"
-        alertSummary = "[MSOutput] Workflow '{}' has output datasets unknown to Rucio".format(wflowName)
-        alertDescription = "Dataset(s): {} cannot be found in Rucio. ".format(containerList)
-        alertDescription += "Thus, we are skipping these datasets from the final output "
-        alertDescription += "data placement, such that this workflow can get archived."
-        self.logger.warning(alertDescription)
-        if self.msConfig["sendNotification"]:
-            self.sendAlert(alertName, alertSeverity, alertSummary, alertDescription, self.alertServiceName)
+        msg = "[MSOutput] Workflow '{}' has output datasets unknown to Rucio ".format(wflowName)
+        msg += "Dataset(s): {} cannot be found in Rucio. ".format(containerList)
+        msg += "Thus, we are skipping these datasets from the final output "
+        msg += "data placement, such that this workflow can get archived."
+        self.logger.warning(msg)
 
     def alertCampaignNotFound(self, campaignName, containerName):
         """

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.7}/src/python/WMCore/ReqMgr/DataStructs/RequestStatus.py

@@ -128,10 +128,10 @@ ALLOWED_ACTIONS_FOR_STATUS = {
                             "NonCustodialSites", "Override",
                             "SubscriptionPriority"],
     "assigned": ["RequestPriority"],
-    "staging": ["RequestPriority", "SiteWhitelist", "SiteBlacklist"],
+    "staging": ["RequestPriority"],
     "staged": ["RequestPriority"],
-    "acquired": ["RequestPriority", "SiteWhitelist", "SiteBlacklist"],
-    "running-open": ["RequestPriority", "SiteWhitelist", "SiteBlacklist"],
+    "acquired": ["RequestPriority"],
+    "running-open": ["RequestPriority"],
     "running-closed": ["RequestPriority"],
     "failed": [],
     "force-complete": [],
@@ -146,18 +146,6 @@ 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"],
@@ -196,10 +184,7 @@ def get_modifiable_properties(status=None):
     TODO: Currently gets the result from hardcoded list. change to get from configuration or db
     """
     if status:
-        allowedKeys = ALLOWED_ACTIONS_FOR_STATUS.get(status, 'all_attributes')
-        # if not allowedKeys == 'all_attributes':
-        #     allowedKeys.extend(ALLOWED_ACTIONS_ALL_STATUS)
-        return allowedKeys
+        return ALLOWED_ACTIONS_FOR_STATUS.get(status, 'all_attributes')
     else:
         return ALLOWED_ACTIONS_FOR_STATUS
 

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.7}/src/python/WMCore/Services/ReqMgrAux/ReqMgrAux.py

@@ -410,8 +410,10 @@ def listDiskUsageOverThreshold(config, updateDB):
 
     if updateDB and not t0Flag:
         agentDrainMode = bool(len(overThresholdDisks))
-        if agentConfig and (agentDrainMode != agentConfig["AgentDrainMode"]):
-            reqMgrAux.updateWMAgentConfig(config.Agent.hostName, {"AgentDrainMode": agentDrainMode},
-                                          inPlace=True)
+        if agentConfig and (agentDrainMode != agentConfig.get("AgentDrainMode")):
+            if agentConfig.get("UserDrainMode") is True:
+                logging.info("Agent is already in UserDrainMode: True mode. No need to update.")
+            else:
+                reqMgrAux.updateWMAgentConfig(config.Agent.hostName, {"AgentDrainMode": agentDrainMode}, inPlace=True)
 
     return overThresholdDisks

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.7}/src/python/WMCore/__init__.py

@@ -6,5 +6,5 @@ Core libraries for Workload Management Packages
 
 """
 
-__version__ = '2.3.6rc7'
+__version__ = '2.3.7'
 __all__ = []

{reqmgr2ms-output-2.3.6rc7 → reqmgr2ms-output-2.3.7/src/python/reqmgr2ms_output.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: reqmgr2ms-output
-Version: 2.3.6rc7
+Version: 2.3.7
 Summary: UNKNOWN
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group