Merge pull request #10 from PanDAWMS/next

3.1.0.63

PILOTVERSION

@@ -1 +1 @@
-3.1.0.60
+3.1.0.63

pilot/control/job.py

@@ -18,7 +18,7 @@
 import logging
 import queue
 
-from json import dumps  #, loads
+from json import dumps
 from re import findall
 from glob import glob
 
@@ -2595,7 +2595,7 @@ def job_monitor(queues, traces, args):  # noqa: C901
                         logger.warning('job state is \'failed\' - order log transfer and abort job_monitor() (2)')
                         _job.stageout = 'log'  # only stage-out log file
                         put_in_queue(_job, queues.data_out)
-                        abort = True
+                        #abort = True
                         break
 
         elif os.environ.get('PILOT_JOB_STATE') == 'stagein':

pilot/user/atlas/common.py

@@ -444,12 +444,9 @@ def get_payload_command(job):
     if not cmd.endswith(';'):
         cmd += '; '
 
-    # only if not using a user container
-    if not job.imagename:
-        site = os.environ.get('PILOT_SITENAME', '')
-        variables = get_payload_environment_variables(
-            cmd, job.jobid, job.taskid, job.attemptnr, job.processingtype, site, userjob)
-        cmd = ''.join(variables) + cmd
+    site = os.environ.get('PILOT_SITENAME', '')
+    variables = get_payload_environment_variables(cmd, job.jobid, job.taskid, job.attemptnr, job.processingtype, site, userjob)
+    cmd = ''.join(variables) + cmd
 
     # prepend PanDA job id in case it is not there already (e.g. runcontainer jobs)
     if 'export PandaID' not in cmd:

pilot/util/constants.py

@@ -14,7 +14,7 @@
 RELEASE = '3'   # released number should be fixed at 3 for Pilot 3
 VERSION = '1'  # version number is '1' for first release, '0' until then, increased for bigger updates
 REVISION = '0'  # revision number should be reset to '0' for every new version release, increased for small updates
-BUILD = '60'     # build number should be reset to '1' for every new development cycle
+BUILD = '63'     # build number should be reset to '1' for every new development cycle
 
 SUCCESS = 0
 FAILURE = 1

pilot/util/realtimelogger.py

@@ -47,7 +47,7 @@ class RealTimeLogger(Logger):
     logfiles_default = []
     openfiles = {}
 
-    def __init__(self, args, info_dic):
+    def __init__(self, args, info_dic, level=INFO):
         """
         Default init function.
 
@@ -60,10 +60,11 @@ def __init__(self, args, info_dic):
 
         :param args: pilot arguments object.
         :param info_dic: info dictionary.
+        :param level: logging level (constant).
         :return:
         """
 
-        super(RealTimeLogger, self).__init__(name="realTimeLogger", level=INFO)
+        super(RealTimeLogger, self).__init__(name="realTimeLogger", level=level)
         RealTimeLogger.glogger = self
 
         if not info_dic:
@@ -88,6 +89,8 @@ def __init__(self, args, info_dic):
         _handler = None
 
         try:
+            server = 'aipanda020.cern.ch'
+            port = 8443
             if logtype == "google-cloud-logging":
                 import google.cloud.logging
                 from google.cloud.logging_v2.handlers import CloudLoggingHandler
@@ -104,8 +107,10 @@ def __init__(self, args, info_dic):
                     server,
                     port,
                     timeout=5.0,
-                    ssl_verify=False,
                     ssl_enable=False,
+                    ssl_verify=False,
+                    user='pilot',
+                    password='XXX'
                 )
                 # Create the handler
                 _handler = AsynchronousLogstashHandler(