From a6f2ca827e60ff7762190ed4cf4fca29e9c68e66 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 6 Jan 2020 13:19:23 -0800 Subject: [PATCH] Stop compressing files during intermediate steps part 2 Stop compressing files that would otherwise be handled uncompressed in intermediate log handling. The reason for this is final log/artifact upload should decide if a file need to be compressed or not as some file hosting services (like swift) may not return the expected data if we get this wrong. This was noticed when we used swift to store intermediate tar.gz tarballs before final upload to permanent storage. When retrieving the tar.gz files from swift we got them back as uncompressed .tar files (because swift was being helpful) and then later when we try to uncompress these files we break. Instead we'll let the upload to swift (or other storage) decide if files should be compressed further than their existing state. This is the second change in the stack and update the stage-output role. Change-Id: I2fa6f123d23568ba1537a7c26d2672f04110c35b --- roles/stage-output/README.rst | 7 ++++++- roles/stage-output/defaults/main.yaml | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/roles/stage-output/README.rst b/roles/stage-output/README.rst index df746402e..8b6fb59ec 100644 --- a/roles/stage-output/README.rst +++ b/roles/stage-output/README.rst @@ -60,6 +60,11 @@ intended to be used before output fetching in a base job's post-playbook. zuul.conf --(staged as)--> zuul_conf.txt .. zuul:rolevar:: stage_compress_logs - :default: True + :default: False When True, files staged as logs will be compressed individually. + Note this option is deprecated as final log storage should control + whether or not contents are compressed. The reason for this is certain + services like swift may serve compressed files like .tar.gz tarballs + uncompressed when you want them to be compressed when served in this + way. diff --git a/roles/stage-output/defaults/main.yaml b/roles/stage-output/defaults/main.yaml index 61c8c89df..c9bf2075d 100644 --- a/roles/stage-output/defaults/main.yaml +++ b/roles/stage-output/defaults/main.yaml @@ -1,3 +1,3 @@ stage_dir: "{{ ansible_user_dir }}" extensions_to_txt: -stage_compress_logs: true +stage_compress_logs: false