wmglobalqueue 2.4.5rc5__tar.gz → 2.4.5rc6__tar.gz

{wmglobalqueue-2.4.5rc5/src/python/wmglobalqueue.egg-info → wmglobalqueue-2.4.5rc6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wmglobalqueue
-Version: 2.4.5rc5
+Version: 2.4.5rc6
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group
 Maintainer-email: hn-cms-wmdevelopment@cern.ch

{wmglobalqueue-2.4.5rc5 → wmglobalqueue-2.4.5rc6}/src/python/WMCore/Services/PyCondor/PyCondorAPI.py

@@ -11,7 +11,7 @@ from past.builtins import basestring
 import logging
 try:
     # This module has dependency with python binding for condor package (condor)
-    import htcondor2 as htcondor
+    import htcondor
 except ImportError:
     pass
 
@@ -111,7 +111,7 @@ class PyCondorAPI(object):
             scheddAd = self.coll.locate(htcondor.DaemonTypes.Schedd)
             q = self.coll.query(htcondor.AdTypes.Schedd, 'Name == "%s"' % scheddAd['Name'],
                                 projection=['CurbMatchmaking'])[0]
-            isOverloaded = q['CurbMatchmaking'].eval(q)
+            isOverloaded = q['CurbMatchmaking'].eval()
             return isOverloaded
         except Exception:
             # if there is an error, try to recreate the collector instance
@@ -121,7 +121,7 @@ class PyCondorAPI(object):
             scheddAd = self.coll.locate(htcondor.DaemonTypes.Schedd)
             q = self.coll.query(htcondor.AdTypes.Schedd, 'Name == "%s"' % scheddAd['Name'],
                                 projection=['CurbMatchmaking'])[0]
-            isOverloaded = q['CurbMatchmaking'].eval(q)
+            isOverloaded = q['CurbMatchmaking'].eval()
         except Exception as ex:
             msg = "Condor failed to fetch schedd attributes."
             msg += "Error message: %s" % str(ex)

wmglobalqueue-2.4.5rc6/src/python/WMCore/Services/PyCondor/PyCondorUtils.py

@@ -0,0 +1,105 @@
+from __future__ import print_function, division
+
+from builtins import str, object
+
+from future.utils import viewitems
+
+import logging
+import os
+import pickle
+import signal
+import time
+import traceback
+
+import htcondor
+
+
+class OutputObj(object):
+    """
+    Class used when AuthenticatedSubprocess is created with pickleOut
+    It stores the output message of the subprocess, any output object provided
+    and extra information for debugging purposes, such as the environment
+    """
+
+    def __init__(self, outputMessage, outputObj):
+        self.outputMessage = outputMessage
+        self.outputObj = outputObj
+        self.environmentStr = ""
+        for key, val in viewitems(os.environ):
+            self.environmentStr += "%s=%s\n" % (key, val)
+
+
+class AuthenticatedSubprocess(object):
+    """
+    Context manager for execution of condor commands in a forked, especially useful for
+    those commands where a different proxy credential is needed.
+    """
+
+    def __init__(self, proxy=None, pickleOut=False, outputObj=None, logger=logging):
+        """
+        Basic setup of the context manager
+        :param proxy: optional path to the proxy file
+        :param pickleOut: boolean flag which enables pickled output data
+        :param outputObj: structure storing the actual output of the htcondor call
+        :param logger: logger object
+        """
+        self.proxy = proxy
+        self.pickleOut = pickleOut
+        self.outputObj = outputObj
+        self.timedout = False
+        self.logger = logger
+
+    def __enter__(self):
+        self.r, self.w = os.pipe()
+        self.rpipe = os.fdopen(self.r, 'r')
+        self.wpipe = os.fdopen(self.w, 'w')
+        self.pid = os.fork()
+        if self.pid == 0 and self.proxy:
+            # CRAB case
+            htcondor.SecMan().invalidateAllSessions()
+            htcondor.param['SEC_CLIENT_AUTHENTICATION_METHODS'] = 'FS,GSI'
+            htcondor.param['DELEGATE_FULL_JOB_GSI_CREDENTIALS'] = 'true'
+            htcondor.param['DELEGATE_JOB_GSI_CREDENTIALS_LIFETIME'] = '0'
+            os.environ['X509_USER_PROXY'] = self.proxy
+            self.rpipe.close()
+        elif self.pid == 0:
+            self.rpipe.close()
+        else:
+            self.wpipe.close()
+        return self.pid, self.rpipe
+
+    def __exit__(self, a, b, c):
+        if self.pid == 0:
+            if a is None and b is None and c is None:
+                if self.pickleOut:
+                    oo = OutputObj("OK", self.outputObj)
+                    self.wpipe.write(pickle.dumps(oo))
+                else:
+                    self.wpipe.write("OK")
+                self.wpipe.close()
+                os._exit(0)
+            else:
+                tracebackString = str('\n'.join(traceback.format_tb(c)))
+                msg = "Trapped exception in AuthenticatedSubprocess.Fork: %s %s %s \n%s" % \
+                      (a, b, c, tracebackString)
+                if self.pickleOut:
+                    oo = OutputObj(msg, self.outputObj)
+                    self.wpipe.write(pickle.dumps(oo))
+                else:
+                    self.wpipe.write(msg)
+                self.wpipe.close()
+                os._exit(1)
+        else:
+            timestart = time.time()
+            self.timedout = True
+            while (time.time() - timestart) < 3600:
+                res = os.waitpid(self.pid, os.WNOHANG)
+                if res != (0, 0):
+                    self.timedout = False
+                    break
+                time.sleep(0.100)
+            if self.timedout:
+                self.logger.warning(
+                    "Subprocess with PID %s (executed in AuthenticatedSubprocess) timed out. Killing it." % self.pid)
+                os.kill(self.pid, signal.SIGTERM)
+                # we should probably wait again and send SIGKILL if the kill does not work

{wmglobalqueue-2.4.5rc5 → wmglobalqueue-2.4.5rc6}/src/python/WMCore/__init__.py

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

{wmglobalqueue-2.4.5rc5 → wmglobalqueue-2.4.5rc6/src/python/wmglobalqueue.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wmglobalqueue
-Version: 2.4.5rc5
+Version: 2.4.5rc6
 Home-page: https://github.com/dmwm/WMCore
 Maintainer: CMS DMWM Group
 Maintainer-email: hn-cms-wmdevelopment@cern.ch

{wmglobalqueue-2.4.5rc5 → wmglobalqueue-2.4.5rc6}/src/python/wmglobalqueue.egg-info/SOURCES.txt

@@ -903,6 +903,7 @@ src/python/WMCore/Services/McM/__init__.py
 src/python/WMCore/Services/MonIT/Grafana.py
 src/python/WMCore/Services/MonIT/__init__.py
 src/python/WMCore/Services/PyCondor/PyCondorAPI.py
+src/python/WMCore/Services/PyCondor/PyCondorUtils.py
 src/python/WMCore/Services/PyCondor/__init__.py
 src/python/WMCore/Services/ReqMgr/ReqMgr.py
 src/python/WMCore/Services/ReqMgr/__init__.py