Merge pull request #73 from dougbenjamin/master

identify blank fileSpec.lfn and fix shifterimg command
HSF · Jul 8, 2020 · ec5ad43 · ec5ad43
2 parents c517058 + d774573
commit ec5ad43
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pandaharvester/harvesterpreparator/analysis_aux_preparator.py b/pandaharvester/harvesterpreparator/analysis_aux_preparator.py
@@ -90,7 +90,7 @@ def trigger_preparation(self, jobspec):
                     args = ['singularity', 'build', '--sandbox', accPathTmp, url ]
                     return_code = self.make_image(jobspec,args)
                 elif self.containerRuntime == 'shifter':
-                    args = ['shifter', 'pull', url ]
+                    args = ['shifterimg', 'pull', url ]
                     return_code = self.make_image(jobspec,args)
                 else:
                     tmpLog.error('unsupported container runtime : {0}'.format(self.containerRuntime))

diff --git a/pandaharvester/harvesterstager/go_bulk_stager.py b/pandaharvester/harvesterstager/go_bulk_stager.py
@@ -430,7 +430,13 @@ def trigger_stage_out(self, jobspec):
         # set the dummy transfer ID which will be replaced with a real ID in check_stage_out_status()
         lfns = []
         for fileSpec in jobspec.get_output_file_specs(skip_done=True):
-            lfns.append(fileSpec.lfn)
+            # test if fileSpec.lfn is not empty
+            if not fileSpec.lfn :
+                msgStr = 'fileSpec.lfn is empty'
+            else:
+                msgStr = 'fileSpec.lfn is {0}'.format(fileSpec.lfn)
+                lfns.append(fileSpec.lfn)
+            tmpLog.debug(msgStr)
         jobspec.set_groups_to_files({self.dummy_transfer_id: {'lfns': lfns,'groupStatus': 'pending'}})
         msgStr = 'jobspec.set_groups_to_files - self.dummy_tranfer_id - {0}, lfns - {1}, groupStatus - pending'.format(self.dummy_transfer_id,lfns)
         tmpLog.debug(msgStr)