Skip to content

fix(clp-package): Fix archive mounting dir for dataset delete. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: containerize-tools
Choose a base branch
from
Draft

fix(clp-package): Fix archive mounting dir for dataset delete. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06f0caa
fix(clp-package): Fix archive mounting dir for dataset delete.
junhaoliao Oct 29, 2025
d8c86b3
limit scope of monkey patching
junhaoliao Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion components/clp-package-utils/clp_package_utils/scripts/dataset_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
from clp_py_utils.s3_utils import generate_container_auth_options

from clp_package_utils.general import (
DockerMount,
DockerMountType,
dump_container_config,
generate_container_config,
generate_container_name,
Expand Down Expand Up @@ -138,7 +140,14 @@ def main(argv: List[str]) -> int:

necessary_mounts = [mounts.logs_dir]
if clp_config.archive_output.storage.type == StorageType.FS:
necessary_mounts.append(mounts.archives_output_dir)
container_archive_output_config = container_clp_config.archive_output.model_copy(deep=True)
container_archive_output_config.storage.transform_for_container()
archives_output_dir_mount = DockerMount(
DockerMountType.BIND,
clp_config.archive_output.get_directory(),
container_archive_output_config.get_directory(),
)
necessary_mounts.append(archives_output_dir_mount)

aws_mount, aws_env_vars = generate_container_auth_options(
clp_config, ARCHIVE_MANAGER_ACTION_NAME
Expand Down
12 changes: 2 additions & 10 deletions components/clp-package-utils/clp_package_utils/scripts/native/dataset_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def _try_deleting_archives(
archive_storage_config = archive_output_config.storage
storage_type = archive_storage_config.type
if StorageType.FS == storage_type:
_try_deleting_archives_from_fs(archive_output_config, dataset_archive_storage_dir)
_try_deleting_archives_from_fs(dataset_archive_storage_dir)
elif StorageType.S3 == storage_type:
_try_deleting_archives_from_s3(
archive_storage_config.s3_config, dataset_archive_storage_dir
Expand All @@ -122,16 +122,8 @@ def _try_deleting_archives(
raise ValueError(f"Unsupported storage type: {storage_type}")


def _try_deleting_archives_from_fs(
archive_output_config: ArchiveOutput, dataset_archive_storage_dir: str
) -> None:
archives_dir = archive_output_config.get_directory()
def _try_deleting_archives_from_fs(dataset_archive_storage_dir: str) -> None:
dataset_archive_storage_path = Path(dataset_archive_storage_dir).resolve()
if not dataset_archive_storage_path.is_relative_to(archives_dir):
raise ValueError(
f"'{dataset_archive_storage_path}' is not within top-level archive storage directory"
f" '{archives_dir}'"
)

if not dataset_archive_storage_path.exists():
logger.debug(f"'{dataset_archive_storage_path}' doesn't exist.")
Expand Down
Loading