reqmgr2ms-output 2.3.5rc3__tar.gz → 2.3.5.1__tar.gz

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

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

{reqmgr2ms-output-2.3.5rc3 → reqmgr2ms-output-2.3.5.1}/requirements.txt

@@ -1,5 +1,6 @@
 CherryPy~=18.8.0
 CMSMonitoring~=0.6.10
+dbs3-client==4.0.19
 future~=0.18.2
 httplib2~=0.20.4
 pycurl~=7.45.1

{reqmgr2ms-output-2.3.5rc3 → reqmgr2ms-output-2.3.5.1}/src/python/WMCore/MicroService/MSOutput/MSOutput.py

@@ -81,7 +81,10 @@ class MSOutput(MSCore):
         self.mode = mode
         self.msConfig.setdefault("limitRequestsPerCycle", 500)
         self.msConfig.setdefault("enableDataPlacement", False)
+        # Enable relval workflows to go to tape
         self.msConfig.setdefault("enableRelValCustodial", False)
+        # Enable relval workflows to go to disk
+        self.msConfig.setdefault("enableRelValDisk", False)
         self.msConfig.setdefault("excludeDataTier", [])
         self.msConfig.setdefault("rucioAccount", 'wmcore_transferor')
         self.msConfig.setdefault("rucioRSEAttribute", 'dm_weight')
@@ -737,8 +740,10 @@ class MSOutput(MSCore):
         :return: True if the dataset is allowed to pass, False otherwise
         """
         # Bypass every configuration for RelVals, keep everything on disk
+        # unless the disk option for this workflow is not enabled.
         if isRelVal:
-            return True
+            return self.msConfig['enableRelValDisk']
+
         dataTier = dataItem['Dataset'].split('/')[-1]
         if dataTier in self.msConfig['excludeDataTier']:
             self.logger.warning("Skipping dataset: %s because it's excluded in the MS configuration",

{reqmgr2ms-output-2.3.5rc3 → reqmgr2ms-output-2.3.5.1}/src/python/WMCore/MicroService/Tools/Common.py

@@ -25,10 +25,6 @@ from Utils.CertTools import ckey, cert
 from WMCore.Services.pycurl_manager import RequestHandler
 from WMCore.Services.pycurl_manager import getdata as multi_getdata
 
-# DBS agregators
-from dbs.apis.dbsClient import aggRuns, aggFileLumis
-
-
 # static variables
 STEP_PAT = re.compile(r'Step[0-9]')
 TASK_PAT = re.compile(r'Task[0-9]')
@@ -279,6 +275,11 @@ def getFileLumisInBlock(blocks, dbsUrl, validFileOnly=1):
     :param validFileOnly: integer flag for valid files only or not
     :return: a dict of blocks with list of file/run/lumi info
     """
+    # importing dbs3-client only in the functions where it is used so that 
+    # we do not need to add it to the docker images of microservices that do
+    # not use it.
+    from dbs.apis.dbsClient import aggFileLumis
+
     runLumisByBlock = {}
     urls = ['%s/filelumis?validFileOnly=%d&block_name=%s' % (dbsUrl, validFileOnly, quote(b)) for b in blocks]
     # limit it to 10 concurrent calls not to overload DBS
@@ -343,6 +344,11 @@ def getRunsInBlock(blocks, dbsUrl):
     :param dbsUrl: string with the DBS URL
     :return: a dictionary of block names and a list of run numbers
     """
+    # importing dbs3-client only in the functions where it is used so that 
+    # we do not need to add it to the docker images of microservices that do
+    # not use it.
+    from dbs.apis.dbsClient import aggRuns
+
     runsByBlock = {}
     urls = ['%s/runs?block_name=%s' % (dbsUrl, quote(b)) for b in blocks]
     logging.info("Executing %d requests against DBS 'runs' API", len(urls))

{reqmgr2ms-output-2.3.5rc3 → reqmgr2ms-output-2.3.5.1}/src/python/WMCore/__init__.py

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

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

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

{reqmgr2ms-output-2.3.5rc3 → reqmgr2ms-output-2.3.5.1}/src/python/reqmgr2ms_output.egg-info/requires.txt

@@ -1,5 +1,6 @@
 CherryPy~=18.8.0
 CMSMonitoring~=0.6.10
+dbs3-client==4.0.19
 future~=0.18.2
 httplib2~=0.20.4
 pycurl~=7.45.1