reqmgr2ms-monitor 2.3.4.1__tar.gz → 2.3.5__tar.gz

{reqmgr2ms-monitor-2.3.4.1/src/python/reqmgr2ms_monitor.egg-info → reqmgr2ms-monitor-2.3.5}/PKG-INFO

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

{reqmgr2ms-monitor-2.3.4.1 → reqmgr2ms-monitor-2.3.5}/src/python/WMCore/Database/CMSCouch.py

@@ -338,30 +338,6 @@ class Database(CouchDBRequests):
             uri += '?' + urllib.parse.urlencode({'rev': rev})
         return Document(id=id, inputDict=self.get(uri))
 
-    def getPrevisousRevision(self, doc_id, numberBefore=1):
-        """
-        :param: doc_id, couch document id
-        :param: numberBefore: previous revision, 1 means one previous revision, 2 means 2 doucments eariler.
-                              special case 0 means the first revision.
-        :return: previous revision document specified by numberBefore
-        """
-        uri = '/%s/%s?revs=true&open_revs=all' % (self.name, urllib.parse.quote_plus(doc_id))
-        revisionRecord = self.get(uri)
-        rev = revisionRecord[0]['ok']['_revisions']
-
-        if numberBefore == 0:
-            revNum = 1
-            revID = rev['start'] - 1
-        else:
-            revNum = rev['start'] - numberBefore
-            revID = rev['ids'][numberBefore]
-        preRev = "%s-%s" % (revNum, revID)
-
-        if doc_id != revisionRecord[0]['ok']['_id']:
-            raise CouchError("revision record doesn match", revisionRecord[0]['ok']['_id'], doc_id)
-
-        return self.document(doc_id, preRev)
-
     def updateDocument(self, doc_id, design, update_func, fields=None, useBody=False):
         """
         Call the update function update_func defined in the design document
@@ -942,10 +918,6 @@ class RotatingDatabase(Database):
         """
         return [doc['value'] for doc in self._find_dbs_in_state('archived')]
 
-    def non_rotating_commit(self):
-        # might need this after all....
-        pass
-
     def makeRequest(self, uri=None, data=None, type='GET', incoming_headers=None,
                     encode=True, decode=True, contentType=None,
                     cache=False, rotate=True):
@@ -1027,7 +999,7 @@ class CouchServer(CouchDBRequests):
         check_name(dbname)
         dbname = urllib.parse.quote_plus(dbname)
         if "cmsweb" in self.url:
-            msg = f"You can't be serious that you want to delete a PROODUCTION database!!! "
+            msg = f"You can't be serious that you want to delete a PRODUCTION database!!! "
             msg += f"At url: {self.url}, for database name: {dbname}. Bailing out!"
             raise RuntimeError(msg)
         return self.delete("/%s" % dbname)

{reqmgr2ms-monitor-2.3.4.1 → reqmgr2ms-monitor-2.3.5}/src/python/WMCore/MicroService/Tools/Common.py

@@ -541,50 +541,6 @@ def postRequest(url, params):
     return data
 
 
-def getIO(request, dbsUrl):
-    "Get input/output info about given request"
-    lhe = False
-    primary = set()
-    parent = set()
-    secondary = set()
-    if 'Chain' in request['RequestType']:
-        base = request['RequestType'].replace('Chain', '')
-        item = 1
-        while '%s%d' % (base, item) in request:
-            alhe, aprimary, aparent, asecondary = \
-                ioForTask(request['%s%d' % (base, item)], dbsUrl)
-            if alhe:
-                lhe = True
-            primary.update(aprimary)
-            parent.update(aparent)
-            secondary.update(asecondary)
-            item += 1
-    else:
-        lhe, primary, parent, secondary = ioForTask(request, dbsUrl)
-    return lhe, primary, parent, secondary
-
-
-def ioForTask(request, dbsUrl):
-    "Return lfn, primary, parent and secondary datasets for given request"
-    lhe = False
-    primary = set()
-    parent = set()
-    secondary = set()
-    if 'InputDataset' in request:
-        datasets = request['InputDataset']
-        datasets = datasets if isinstance(datasets, list) else [datasets]
-        primary = set([r for r in datasets if r])
-    if primary and 'IncludeParent' in request and request['IncludeParent']:
-        parent = findParent(primary, dbsUrl)
-    if 'MCPileup' in request:
-        pileups = request['MCPileup']
-        pileups = pileups if isinstance(pileups, list) else [pileups]
-        secondary = set([r for r in pileups if r])
-    if 'LheInputFiles' in request and request['LheInputFiles'] in ['True', True]:
-        lhe = True
-    return lhe, primary, parent, secondary
-
-
 def findParent(datasets, dbsUrl):
     """
     Helper function to find the parent dataset.

{reqmgr2ms-monitor-2.3.4.1 → reqmgr2ms-monitor-2.3.5}/src/python/WMCore/Services/ReqMgrAux/ReqMgrAux.py

@@ -104,7 +104,7 @@ class ReqMgrAux(Service):
         resp = self["requests"].put('cmsswversions', cmsswVersions)[0]['result']
 
         if resp and resp[0].get("ok", False):
-            self["logger"].info("CMSSW document successfuly updated.")
+            self["logger"].info("CMSSW document successfully updated.")
             return True
 
         msg = "Failed to update CMSSW document. Response: %s" % resp

{reqmgr2ms-monitor-2.3.4.1 → reqmgr2ms-monitor-2.3.5}/src/python/WMCore/Services/Requests.py

@@ -500,7 +500,7 @@ class Requests(dict):
         elif verb == 'PUT':
             c.setopt(pycurl.CUSTOMREQUEST, 'PUT')
         else:
-            raise HTTPException("Verb %s not sopported for upload." % verb)
+            raise HTTPException("Verb %s not supported for upload." % verb)
         c.setopt(c.URL, url)
         fullParams = [(fieldName, (c.FORM_FILE, fileName))]
         fullParams.extend(params)

{reqmgr2ms-monitor-2.3.4.1 → reqmgr2ms-monitor-2.3.5}/src/python/WMCore/Services/Rucio/Rucio.py

@@ -744,7 +744,7 @@ class Rucio(object):
         """
         _pickRSE_
 
-        Use a weighted random selection algorithm to pick an RSE for a dataset based on an attribute
+        Use a weighted random selection algorithm to pick an RSE for a dataset based on an RSE attribute.
         The attribute should correlate to space available.
         :param rseExpression: Rucio RSE expression to pick RSEs (defaults to production Tape RSEs)
         :param rseAttribute: The RSE attribute to use as a weight. Must be a number
@@ -757,18 +757,21 @@ class Rucio(object):
         rsesWeight = []
 
         for rse in matchingRSEs:
-            attrs = self.cli.list_rse_attributes(rse)
+            rseAttrs = self.cli.list_rse_attributes(rse)
             if rseAttribute:
                 try:
-                    quota = float(attrs.get(rseAttribute, 0))
+                    attrValue = float(rseAttrs.get(rseAttribute, 0))
                 except (TypeError, KeyError):
-                    quota = 0
+                    attrValue = 0
             else:
-                quota = 1
-            requiresApproval = attrs.get('requires_approval', False)
-            if quota > minNeeded:
+                attrValue = 1
+            requiresApproval = rseAttrs.get('requires_approval', False)
+            if rseAttribute == "ddm_quota" and attrValue > minNeeded:
+                rsesWithApproval.append((rse, requiresApproval))
+                rsesWeight.append(attrValue)
+            elif rseAttribute != "ddm_quota":  # e.g. dm_weight
                 rsesWithApproval.append((rse, requiresApproval))
-                rsesWeight.append(quota)
+                rsesWeight.append(attrValue)
 
         return weightedChoice(rsesWithApproval, rsesWeight)
 

{reqmgr2ms-monitor-2.3.4.1 → reqmgr2ms-monitor-2.3.5}/src/python/WMCore/Services/WMArchive/DataMap.py

@@ -304,7 +304,7 @@ def convertStepValue(stepValue):
             stepValue['input'] = convertInput(stepValue['input'][list(stepValue['input'])[0]])
 
         else:
-            raise Exception("Unknow iput key %s" % list(stepValue['input']))
+            raise Exception("Unknown input key %s" % list(stepValue['input']))
 
     if "output" in stepValue:
         # remove output module name layer

{reqmgr2ms-monitor-2.3.4.1 → reqmgr2ms-monitor-2.3.5}/src/python/WMCore/__init__.py

@@ -6,5 +6,5 @@ Core libraries for Workload Management Packages
 
 """
 
-__version__ = '2.3.4.1'
+__version__ = '2.3.5'
 __all__ = []

{reqmgr2ms-monitor-2.3.4.1 → reqmgr2ms-monitor-2.3.5/src/python/reqmgr2ms_monitor.egg-info}/PKG-INFO

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