reqmgr2ms-output 2.3.2rc3__tar.gz → 2.3.2rc5__tar.gz

{reqmgr2ms-output-2.3.2rc3/src/python/reqmgr2ms_output.egg-info → reqmgr2ms-output-2.3.2rc5}/PKG-INFO

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

{reqmgr2ms-output-2.3.2rc3 → reqmgr2ms-output-2.3.2rc5}/src/python/WMCore/Lexicon.py

@@ -26,7 +26,7 @@ from WMCore.WMException import WMException, WMEXCEPTION_START_STR, WMEXCEPTION_E
 # i.e production should end with v[number]
 PRIMARY_DS = {'re': '^[a-zA-Z][a-zA-Z0-9\-_]*$', 'maxLength': 99}
 PROCESSED_DS = {'re': '[a-zA-Z0-9\.\-_]+', 'maxLength': 199}
-TIER = {'re': '[A-Z\-_]+', 'maxLength': 99}
+TIER = {'re': '[A-Z0-9\-_]+', 'maxLength': 99}
 BLOCK_STR = {'re': '#[a-zA-Z0-9\.\-_]+', 'maxLength': 100}
 
 lfnParts = {
@@ -103,7 +103,7 @@ def searchblock(candidate):
     return check(regexp, candidate)
 
 
-SEARCHDATASET_RE = r'^/(\*|[a-zA-Z\*][a-zA-Z0-9_\*\-]{0,100})(/(\*|[a-zA-Z0-9_\.\-\*]{1,199})){0,1}(/(\*|[A-Z\-\*]{1,50})){0,1}$'
+SEARCHDATASET_RE = r'^/(\*|[a-zA-Z\*][a-zA-Z0-9_\*\-]{0,100})(/(\*|[a-zA-Z0-9_\.\-\*]{1,199})){0,1}(/(\*|[A-Z0-9\-\*]{1,99})){0,1}$'
 
 
 def searchdataset(candidate):
@@ -202,7 +202,7 @@ def globalTag(candidate):
     return check(r'[a-zA-Z0-9\s\.\-_:]{1,100}$', candidate)
 
 
-DATASET_RE = r'^/[a-zA-Z0-9\-_]{1,99}/[a-zA-Z0-9\.\-_]{1,199}/[A-Z\-]{1,50}$'
+DATASET_RE = r'^/[a-zA-Z0-9\-_]{1,99}/[a-zA-Z0-9\.\-_]{1,199}/[A-Z0-9\-]{1,99}$'
 
 
 def dataset(candidate):

{reqmgr2ms-output-2.3.2rc3 → reqmgr2ms-output-2.3.2rc5}/src/python/WMCore/MicroService/MSOutput/MSOutput.py

@@ -1,14 +1,10 @@
 """
-File       : MSOtput.py
+File       : MSOutput.py
 
 Description: MSOutput.py class provides the whole logic behind
 the Output data placement in WMCore MicroServices.
 """
 
-# futures
-from __future__ import division, print_function
-from future.utils import viewitems
-
 # system modules
 import time
 from pymongo import IndexModel, ReturnDocument, errors
@@ -88,7 +84,7 @@ class MSOutput(MSCore):
         self.msConfig.setdefault("enableRelValCustodial", False)
         self.msConfig.setdefault("excludeDataTier", [])
         self.msConfig.setdefault("rucioAccount", 'wmcore_transferor')
-        self.msConfig.setdefault("rucioRSEAttribute", 'ddm_quota')
+        self.msConfig.setdefault("rucioRSEAttribute", 'dm_weight')
         self.msConfig.setdefault("rucioDiskRuleWeight", 'ddm_quota')
         self.msConfig.setdefault("rucioTapeExpression", 'rse_type=TAPE\cms_type=test')
         # This Disk expression wil target all real DISK T1 and T2 RSEs
@@ -240,7 +236,7 @@ class MSOutput(MSCore):
 
         # filter out documents already produced
         finalRequests = []
-        for reqName, reqData in viewitems(requestRecords):
+        for reqName, reqData in requestRecords.items():
             if reqName in mongoDocNames:
                 self.logger.info("Mongo document already created for %s, skipping it.", reqName)
             else:
@@ -634,7 +630,7 @@ class MSOutput(MSCore):
         A function used to update one or few particular fields in a document
         :**kwargs: The keys/value pairs to be updated (will be tested against MSOutputTemplate)
         """
-        for key, value in viewitems(kwargs):
+        for key, value in kwargs.items():
             try:
                 msOutDoc.setKey(key, value)
                 msOutDoc.updateTime()

{reqmgr2ms-output-2.3.2rc3 → reqmgr2ms-output-2.3.2rc5}/src/python/WMCore/Services/Rucio/Rucio.py

@@ -169,7 +169,7 @@ class Rucio(object):
         :return: a list of block names
         """
         blockNames = []
-        if not self.isContainer(container):
+        if not self.isContainer(container, scope=scope):
             # input container wasn't really a container
             self.logger.warning("Provided DID name is not a CONTAINER type: %s", container)
             return blockNames
@@ -360,7 +360,9 @@ class Rucio(object):
         """
         if not isinstance(dids, list):
             dids = [dids]
-        dids = [{'scope': scope, 'name': did} for did in dids]
+        # NOTE: the attaching dids do not create new container within a scope
+        # and it is safe to use cms scope for it
+        dids = [{'scope': 'cms', 'name': did} for did in dids]
 
         response = False
         try:
@@ -881,7 +883,7 @@ class Rucio(object):
 
         # At this point, we might already have some of the RSEs where the data is available and locked
         # Now check dataset locks and compare those rules against our list of multi RSE rules
-        if self.isContainer(kwargs['name']):
+        if self.isContainer(kwargs['name'], scope=kwargs.get('scope', 'cms')):
             # It's a container! Find what those RSEs are and add them to the finalRSEs set
             rseLocks = self._getContainerLockedAndAvailable(multiRSERules, returnTape=returnTape, **kwargs)
             self.logger.debug("Data location for %s from multiple RSE locks and available at: %s",
@@ -988,7 +990,7 @@ class Rucio(object):
         a specific method for this process, even though that adds some code duplication.
         """
         result = dict()
-        if not self.isContainer(container):
+        if not self.isContainer(container, scope=scope):
             raise WMRucioException("Pileup location needs to be resolved for a container DID type")
 
         multiRSERules = []
@@ -1096,7 +1098,7 @@ class Rucio(object):
         """
         if 'name' not in kwargs:
             raise WMRucioException("A DID name must be provided to the getBlockLockedAndAvailable API")
-        if self.isContainer(kwargs['name']):
+        if self.isContainer(kwargs['name'], scope=kwargs.get('scope', 'cms')):
             # then resolve it at container level and all its blocks
             return self.getContainerLockedAndAvailable(**kwargs)
 

{reqmgr2ms-output-2.3.2rc3 → reqmgr2ms-output-2.3.2rc5}/src/python/WMCore/__init__.py

@@ -6,5 +6,5 @@ Core libraries for Workload Management Packages
 
 """
 
-__version__ = '2.3.2rc3'
+__version__ = '2.3.2rc5'
 __all__ = []

{reqmgr2ms-output-2.3.2rc3 → reqmgr2ms-output-2.3.2rc5/src/python/reqmgr2ms_output.egg-info}/PKG-INFO

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