Skip to content

feat(storage): migrate all data mounts to versioned 16/main subdirectories #1649

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
marceloneppel wants to merge 2 commits into
base: 16/edge
Choose a base branch
from
Draft

feat(storage): migrate all data mounts to versioned 16/main subdirectories #1649

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
c2f8d9b
feat(storage): migrate all data mounts to versioned 16/main subdirect…
marceloneppel Apr 24, 2026
73bbade
fix: reinitialise temp tablespace after tmpfs wipe on reboot
marceloneppel Apr 24, 2026
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
17 changes: 10 additions & 7 deletions src/backups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@
from tenacity import RetryError, Retrying, stop_after_attempt, wait_fixed

from constants import (
ARCHIVE_DATA_DIR,
BACKUP_ID_FORMAT,
BACKUP_TYPE_OVERRIDES,
BACKUP_USER,
LOGS_DATA_DIR,
PATRONI_CONF_PATH,
PGBACKREST_ARCHIVE_TIMEOUT_ERROR_CODE,
PGBACKREST_BACKUP_ID_FORMAT,
Expand All @@ -42,7 +44,8 @@
PGBACKREST_LOG_LEVEL_STDERR,
PGBACKREST_LOGROTATE_FILE,
PGBACKREST_LOGS_PATH,
POSTGRESQL_DATA_PATH,
POSTGRESQL_DATA_DIR,
TEMP_DATA_DIR,
UNIT_SCOPE,
)
from relations.async_replication import REPLICATION_CONSUMER_RELATION, REPLICATION_OFFER_RELATION
Expand Down Expand Up @@ -245,7 +248,7 @@ def can_use_s3_repository(self) -> tuple[bool, str]:

return_code, system_identifier_from_instance, error = self._execute_command([
f"/snap/charmed-postgresql/current/usr/lib/postgresql/{self.charm._patroni.get_postgresql_version().split('.')[0]}/bin/pg_controldata",
POSTGRESQL_DATA_PATH,
POSTGRESQL_DATA_DIR,
])
if return_code != 0:
raise Exception(error)
Expand Down Expand Up @@ -353,10 +356,10 @@ def _create_bucket_if_not_exists(self) -> None:
def _empty_data_files(self) -> bool:
"""Empty the PostgreSQL data directory in preparation of backup restore."""
paths = [
"/var/snap/charmed-postgresql/common/data/archive",
POSTGRESQL_DATA_PATH,
"/var/snap/charmed-postgresql/common/data/logs",
"/var/snap/charmed-postgresql/common/data/temp",
ARCHIVE_DATA_DIR,
POSTGRESQL_DATA_DIR,
LOGS_DATA_DIR,
TEMP_DATA_DIR,
]
path = None
try:
Expand Down Expand Up @@ -1379,7 +1382,7 @@ def _render_pgbackrest_conf_file(self) -> bool:
enable_tls=len(self.charm._peer_members_ips) > 0,
peer_endpoints=self.charm._peer_members_ips,
path=s3_parameters["path"],
data_path=f"{POSTGRESQL_DATA_PATH}",
data_path=POSTGRESQL_DATA_DIR,
log_path=f"{PGBACKREST_LOGS_PATH}",
region=s3_parameters.get("region"),
endpoint=s3_parameters["endpoint"],
Expand Down
Loading
Loading