From aab788939d0e6cede2da827aa096f1170d6658da Mon Sep 17 00:00:00 2001
From: Daniel Savoiu <daniel.savoiu@cern.ch>
Date: Fri, 25 Aug 2023 16:44:34 +0200
Subject: [PATCH] Specify `gzip` compression explicitly for `tar` formatter.
---
analysis/tasks/FastProd.py | 4 ++--
analysis/tasks/FastWarm.py | 4 ++--
analysis/tasks/MergeFastWarm.py | 4 ++--
analysis/tasks/Warmup.py | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/analysis/tasks/FastProd.py b/analysis/tasks/FastProd.py
index af96b00..1d3d5bd 100644
--- a/analysis/tasks/FastProd.py
+++ b/analysis/tasks/FastProd.py
@@ -216,7 +216,7 @@ class FastProd(Task, TarballExtractionMixin, HTCondorWorkflow, law.LocalWorkflow
logger.debug(
"Job successful. Writing output tarfile from directory: %s", os.getcwd()
)
- self.output().dump(os.getcwd(), formatter="tar", add_kwargs=dict(filter=tarfilter))
+ self.output().dump(os.getcwd(), mode="w:gz", formatter="tar", add_kwargs=dict(filter=tarfilter))
else:
debugfile = re.sub(
'.tar.gz$', '.debug.tar.gz', os.path.basename(self.output().path)
@@ -225,7 +225,7 @@ class FastProd(Task, TarballExtractionMixin, HTCondorWorkflow, law.LocalWorkflow
"Job failed. Writing debug tarfile: %s -> %s",
os.getcwd(), debugfile
)
- self.remote_target(debugfile).dump(os.getcwd(), formatter="tar")
+ self.remote_target(debugfile).dump(os.getcwd(), mode="w:gz", formatter="tar")
logger.debug("Removing temporary directory: %s", tmpdirpath)
shutil.rmtree(tmpdirpath)
diff --git a/analysis/tasks/FastWarm.py b/analysis/tasks/FastWarm.py
index 95f915c..e9d63cb 100644
--- a/analysis/tasks/FastWarm.py
+++ b/analysis/tasks/FastWarm.py
@@ -203,7 +203,7 @@ class FastWarm(Task, TarballExtractionMixin, HTCondorWorkflow, law.LocalWorkflow
logger.debug(
"Job successful. Writing output tarfile from directory: %s", os.getcwd()
)
- self.output().dump(os.getcwd(), formatter="tar", add_kwargs=dict(filter=tarfilter))
+ self.output().dump(os.getcwd(), mode="w:gz", formatter="tar", add_kwargs=dict(filter=tarfilter))
else:
debugfile = re.sub(
'.tar.gz$', '.debug.tar.gz', os.path.basename(self.output().path)
@@ -212,7 +212,7 @@ class FastWarm(Task, TarballExtractionMixin, HTCondorWorkflow, law.LocalWorkflow
"Job failed. Writing debug tarfile: %s -> %s",
os.getcwd(), debugfile
)
- self.remote_target(debugfile).dump(os.getcwd(), formatter="tar")
+ self.remote_target(debugfile).dump(os.getcwd(), mode="w:gz", formatter="tar")
logger.debug("Removing temporary directory: %s", tmpdirpath)
shutil.rmtree(tmpdirpath)
diff --git a/analysis/tasks/MergeFastWarm.py b/analysis/tasks/MergeFastWarm.py
index d661834..1dcd8ea 100644
--- a/analysis/tasks/MergeFastWarm.py
+++ b/analysis/tasks/MergeFastWarm.py
@@ -144,7 +144,7 @@ class MergeFastWarm(Task, TarballExtractionMixin, HTCondorRemoteStorageMixin):
logger.debug(
"Job successful. Writing output tarfile from directory: %s", os.getcwd()
)
- self.output().dump(os.getcwd(), formatter="tar", add_kwargs=dict(filter=tarfilter))
+ self.output().dump(os.getcwd(), mode="w:gz", formatter="tar", add_kwargs=dict(filter=tarfilter))
else:
debugfile = re.sub(
'.tar.gz$', '.debug.tar.gz', os.path.basename(self.output().path)
@@ -153,7 +153,7 @@ class MergeFastWarm(Task, TarballExtractionMixin, HTCondorRemoteStorageMixin):
"Job failed. Writing debug tarfile: %s -> %s",
os.getcwd(), debugfile
)
- self.remote_target(debugfile).dump(os.getcwd(), formatter="tar")
+ self.remote_target(debugfile).dump(os.getcwd(), mode="w:gz", formatter="tar")
logger.debug("Removing temporary directory: %s", tmpdirpath)
shutil.rmtree(tmpdirpath)
diff --git a/analysis/tasks/Warmup.py b/analysis/tasks/Warmup.py
index 636a61a..ca27a6c 100644
--- a/analysis/tasks/Warmup.py
+++ b/analysis/tasks/Warmup.py
@@ -199,12 +199,12 @@ class Warmup(Task, TarballExtractionMixin, HTCondorWorkflow, law.LocalWorkflow):
logger.debug("Job successful. Writing output tarfile from directory: %s", os.getcwd())
logger.debug("Job successful. Writing output tarfile to directory: %s", self.output().path)
- self.output().dump(os.getcwd(), formatter="tar", add_kwargs=dict(filter=tarfilter))
+ self.output().dump(os.getcwd(), mode="w:gz", formatter="tar", add_kwargs=dict(filter=tarfilter))
else:
if self.htcondor_remote_storage:
debugfile = re.sub('.tar.gz$', '.debug.tar.gz', os.path.basename(self.output().path))
logger.debug("Job failed. Writing debug tarfile: %s -> %s", os.getcwd(), debugfile)
- self.remote_target(debugfile).dump(os.getcwd(), formatter="tar")
+ self.remote_target(debugfile).dump(os.getcwd(), mode="w:gz", formatter="tar")
logger.debug("Removing temporary directory: %s", tmpdirpath)
shutil.rmtree(tmpdirpath)
--
GitLab