Merge pull request #72 from wyang007/master

fixes needed to run Harvester at NERSC
PanDAWMS · Feb 26, 2018 · 03bbcd1 · 03bbcd1
2 parents a8d34c2 + c24d75e
commit 03bbcd1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/pandaharvester/harvesterstager/rse_direct_stager.py b/pandaharvester/harvesterstager/rse_direct_stager.py
@@ -1,6 +1,11 @@
+import os
+import zipfile
+
 from pandaharvester.harvestercore import core_utils
 from pandaharvester.harvestercore.plugin_base import PluginBase
 
+# logger
+baseLogger = core_utils.setup_logger('rse_direct_stager')
 
 # stager plugin with RSE + no data motion
 class RseDirectStager(PluginBase):

diff --git a/pandaharvester/harvestersubmitter/slurm_submitter.py b/pandaharvester/harvestersubmitter/slurm_submitter.py
@@ -73,7 +73,8 @@ def make_batch_script(self, workspec):
         tmpFile = tempfile.NamedTemporaryFile(delete=False, suffix='_submit.sh', dir=workspec.get_access_point())
         tmpFile.write(self.template.format(nCorePerNode=self.nCorePerNode,
                                            nNode=workspec.nCore / self.nCorePerNode,
-                                           accessPoint=workspec.accessPoint)
+                                           accessPoint=workspec.accessPoint,
+                                           workerID=workspec.workerID)
                       )
         tmpFile.close()
         return tmpFile.name