From e65a8b40add979da566910c406ac6801e1314587 Mon Sep 17 00:00:00 2001 From: Junhao Liao Date: Fri, 26 Dec 2025 04:32:00 -0500 Subject: [PATCH] fix(job-orchestration): Move garbage collector recovery file to temporary directory (fixes #1823). --- .../garbage_collector/archive_garbage_collector.py | 2 +- .../package-helm/templates/garbage-collector-deployment.yaml | 2 +- tools/deployment/package/docker-compose-all.yaml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/job-orchestration/job_orchestration/garbage_collector/archive_garbage_collector.py b/components/job-orchestration/job_orchestration/garbage_collector/archive_garbage_collector.py index c8dbcac0b4..d8c2cf4b89 100644 --- a/components/job-orchestration/job_orchestration/garbage_collector/archive_garbage_collector.py +++ b/components/job-orchestration/job_orchestration/garbage_collector/archive_garbage_collector.py @@ -202,7 +202,7 @@ async def archive_garbage_collector( validate_storage_type(archive_output_config, storage_engine) sweep_interval_secs = clp_config.garbage_collector.sweep_interval.archive * MIN_TO_SECONDS - recovery_file = clp_config.logs_directory / f"{ARCHIVE_GARBAGE_COLLECTOR_NAME}.tmp" + recovery_file = clp_config.tmp_directory / f"{ARCHIVE_GARBAGE_COLLECTOR_NAME}.tmp" logger.info(f"{ARCHIVE_GARBAGE_COLLECTOR_NAME} started.") try: diff --git a/tools/deployment/package-helm/templates/garbage-collector-deployment.yaml b/tools/deployment/package-helm/templates/garbage-collector-deployment.yaml index a4f810cb73..3e9cadd34c 100644 --- a/tools/deployment/package-helm/templates/garbage-collector-deployment.yaml +++ b/tools/deployment/package-helm/templates/garbage-collector-deployment.yaml @@ -64,7 +64,7 @@ spec: subPath: "clp-config.yaml" readOnly: true - name: "tmp" - mountPath: "/var/log" + mountPath: "/var/tmp" - name: {{ include "clp.volumeName" (dict "component_category" "garbage-collector" "name" "logs" diff --git a/tools/deployment/package/docker-compose-all.yaml b/tools/deployment/package/docker-compose-all.yaml index 2502cf5f52..dd9ab028a9 100644 --- a/tools/deployment/package/docker-compose-all.yaml +++ b/tools/deployment/package/docker-compose-all.yaml @@ -411,6 +411,7 @@ services: volumes: - *volume_clp_config_readonly - *volume_clp_logs + - *volume_clp_tmp - "${CLP_ARCHIVE_OUTPUT_DIR_HOST:-empty}:/var/data/archives" - "${CLP_AWS_CONFIG_DIR_HOST:-empty}:/opt/clp/.aws:ro" - "${CLP_STREAM_OUTPUT_DIR_HOST:-empty}:/var/data/streams"