diff --git a/CHANGES b/CHANGES index afe9ccb1..69199e1d 100644 --- a/CHANGES +++ b/CHANGES @@ -111,10 +111,7 @@ Log tailing (requested by R. Walker) 73.2 list_replicas() -- OUTCOMMENTED: Specifying --pfn in rucio download, stageIn(), which will prevent list_replicas() from being used on server side (rucio_sitemover) - -Backslash issue at TRIUMF -- Removed singularity wrapper from stageInFile() and stageOutFile() (gfalcoy_sitemover) +- Specifying --pfn in rucio download, stageIn(), which will prevent list_replicas() from being used on server side (rucio_sitemover) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/PILOTVERSION b/PILOTVERSION index 923118b8..82e9b591 100644 --- a/PILOTVERSION +++ b/PILOTVERSION @@ -1 +1 @@ -PICARD 73.2 RC2 +PICARD 73.2 diff --git a/movers/gfalcopy_sitemover.py b/movers/gfalcopy_sitemover.py index 9252e3b0..920ed8b1 100644 --- a/movers/gfalcopy_sitemover.py +++ b/movers/gfalcopy_sitemover.py @@ -185,8 +185,8 @@ def stageOutFile(self, source, destination, fspec): cmd = '%s --verbose %s -p -f -t %s %s -S %s %s %s' % (self.copy_command, checksum_opt, timeout, gfal_prop, token, srcUrl, destination) # Prepend the command with singularity if necessary - #from Singularity import singularityWrapper - #cmd = singularityWrapper(cmd, fspec.cmtconfig, dirname(src)) + from Singularity import singularityWrapper + cmd = singularityWrapper(cmd, fspec.cmtconfig, dirname(src)) return self._stagefile(cmd, src, destination, filesize, is_stagein=False) @@ -215,8 +215,8 @@ def stageInFile(self, source, destination, fspec): cmd = '%s --verbose %s -f -t %s %s %s %s' % (self.copy_command, checksum_opt, timeout, gfal_prop, source, dstUrl) # Prepend the command with singularity if necessary - #from Singularity import singularityWrapper - #cmd = singularityWrapper(cmd, fspec.cmtconfig, dirname(destination)) + from Singularity import singularityWrapper + cmd = singularityWrapper(cmd, fspec.cmtconfig, dirname(destination)) return self._stagefile(cmd, source, destination, fspec.filesize, is_stagein=True) diff --git a/movers/rucio_sitemover.py b/movers/rucio_sitemover.py index c5297ac2..8d2e25a5 100644 --- a/movers/rucio_sitemover.py +++ b/movers/rucio_sitemover.py @@ -56,34 +56,34 @@ def stageIn(self, turl, dst, fspec): :return: destination file details (ddmendpoint, surl, pfn) """ -# cmd = 'rucio -v download --dir %s --rse %s --pfn %s %s:%s' % (dirname(dst), -# fspec.ddmendpoint, -# fspec.turl, -# fspec.scope, -# fspec.lfn) - - if fspec.replicas: - if not fspec.allowAllInputRSEs: - cmd = 'rucio -v download --dir %s --rse %s %s:%s' % (dirname(dst), - fspec.replicas[0][0], - fspec.scope, - fspec.lfn) - else: - cmd = 'rucio -v download --dir %s %s:%s' % (dirname(dst), - fspec.scope, - fspec.lfn) - else: - if self.isDeterministic(fspec.ddmendpoint): - cmd = 'rucio -v download --dir %s --rse %s %s:%s' % (dirname(dst), - fspec.ddmendpoint, - fspec.scope, - fspec.lfn) - else: - cmd = 'rucio -v download --dir %s --rse %s --pfn %s %s:%s' % (dirname(dst), - fspec.ddmendpoint, - fspec.turl, - fspec.scope, - fspec.lfn) + cmd = 'rucio -v download --dir %s --rse %s --pfn %s %s:%s' % (dirname(dst), + fspec.ddmendpoint, + fspec.turl, + fspec.scope, + fspec.lfn) + +# if fspec.replicas: +# if not fspec.allowAllInputRSEs: +# cmd = 'rucio -v download --dir %s --rse %s %s:%s' % (dirname(dst), +# fspec.replicas[0][0], +# fspec.scope, +# fspec.lfn) +# else: +# cmd = 'rucio -v download --dir %s %s:%s' % (dirname(dst), +# fspec.scope, +# fspec.lfn) +# else: +# if self.isDeterministic(fspec.ddmendpoint): +# cmd = 'rucio -v download --dir %s --rse %s %s:%s' % (dirname(dst), +# fspec.ddmendpoint, +# fspec.scope, +# fspec.lfn) +# else: +# cmd = 'rucio -v download --dir %s --rse %s --pfn %s %s:%s' % (dirname(dst), +# fspec.ddmendpoint, +# fspec.turl, +# fspec.scope, +# fspec.lfn) # Prepend the command with singularity if necessary from Singularity import singularityWrapper cmd = singularityWrapper(cmd, fspec.cmtconfig, dirname(dst))