Skip to content
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.

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

fix: For repeated trials, add timestamp to etcd backups to prevent overwriting with empty data #2882

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 1 addition & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,6 @@ logs/

# Generated files
docs/manager/rest-reference/openapi.json

backup.*.json
/DIST-INFO
/INSTALL-INFO

etcd_container_registries_backup.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
import sys
import warnings
from concurrent.futures import ThreadPoolExecutor
from datetime import datetime
from itertools import groupby
from pathlib import Path
from queue import Queue
from typing import Any, Final, Mapping, cast

Expand Down Expand Up @@ -52,8 +54,7 @@
}).allow_extra("*")

ETCD_CONTAINER_REGISTRY_KEY: Final = "config/docker/registry"

ETCD_CONTAINER_REGISTRIES_BACKUP_FILENAME: Final = "etcd_container_registries_backup.json"
ETCD_BACKUP_FILENAME_PATTERN: Final = "backup.etcd.container-registries.{timestamp}.json"


class ContainerRegistryType(enum.StrEnum):
Expand Down Expand Up @@ -130,10 +131,9 @@ def migrate_data_etcd_to_psql() -> None:
with ThreadPoolExecutor() as executor:

def backup(etcd_container_registries: Mapping[str, Any]):
backup_path = os.getenv("BACKEND_ETCD_BACKUP_PATH", ".")
with open(
os.path.join(backup_path, ETCD_CONTAINER_REGISTRIES_BACKUP_FILENAME), "w"
) as f:
backup_path = Path(os.getenv("BACKEND_ETCD_BACKUP_PATH", "."))
backup_path /= ETCD_BACKUP_FILENAME_PATTERN.format(timestamp=datetime.now().isoformat())
with open(backup_path, "w") as f:
json.dump(dict(etcd_container_registries), f, indent=4)

# If there are no container registries, it returns an empty list.
Expand Down
Loading