Skip to content

Commit 853ddc2

Browse files
authored
Add support for WALG_FILE_PREFIX
1 parent 937815a commit 853ddc2

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

postgres-appliance/scripts/configure_spilo.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
USE_KUBERNETES = os.environ.get('KUBERNETES_SERVICE_HOST') is not None
3535
KUBERNETES_DEFAULT_LABELS = '{"application": "spilo"}'
3636
PATRONI_DCS = ('kubernetes', 'zookeeper', 'exhibitor', 'consul', 'etcd3', 'etcd')
37-
AUTO_ENABLE_WALG_RESTORE = ('WAL_S3_BUCKET', 'WALE_S3_PREFIX', 'WALG_S3_PREFIX', 'WALG_AZ_PREFIX', 'WALG_SSH_PREFIX')
37+
AUTO_ENABLE_WALG_RESTORE = ('WAL_S3_BUCKET', 'WALE_S3_PREFIX', 'WALG_S3_PREFIX', 'WALG_AZ_PREFIX', 'WALG_SSH_PREFIX', 'WALG_FILE_PREFIX')
3838
WALG_SSH_NAMES = ['WALG_SSH_PREFIX', 'SSH_PRIVATE_KEY_PATH', 'SSH_USERNAME', 'SSH_PORT']
3939

4040

@@ -818,6 +818,7 @@ def write_wale_environment(placeholders, prefix, overwrite):
818818
'SWIFT_AUTH_VERSION', 'SWIFT_ENDPOINT_TYPE', 'SWIFT_REGION', 'SWIFT_DOMAIN_NAME', 'SWIFT_DOMAIN_ID',
819819
'SWIFT_PROJECT_NAME', 'SWIFT_PROJECT_ID', 'SWIFT_PROJECT_DOMAIN_NAME', 'SWIFT_PROJECT_DOMAIN_ID']
820820
ssh_names = WALG_SSH_NAMES
821+
file_names = ['WALG_FILE_PREFIX']
821822
walg_names = ['WALG_DELTA_MAX_STEPS', 'WALG_DELTA_ORIGIN', 'WALG_DOWNLOAD_CONCURRENCY',
822823
'WALG_UPLOAD_CONCURRENCY', 'WALG_UPLOAD_DISK_CONCURRENCY', 'WALG_DISK_RATE_LIMIT',
823824
'WALG_NETWORK_RATE_LIMIT', 'WALG_COMPRESSION_METHOD', 'USE_WALG_BACKUP',
@@ -831,7 +832,7 @@ def write_wale_environment(placeholders, prefix, overwrite):
831832
for name in ['PGVERSION', 'PGPORT', 'WALE_ENV_DIR', 'SCOPE', 'WAL_BUCKET_SCOPE_PREFIX', 'WAL_BUCKET_SCOPE_SUFFIX',
832833
'WAL_S3_BUCKET', 'WAL_GCS_BUCKET', 'WAL_GS_BUCKET', 'WAL_SWIFT_BUCKET', 'BACKUP_NUM_TO_RETAIN',
833834
'ENABLE_WAL_PATH_COMPAT'] + s3_names + swift_names + gs_names + walg_names + azure_names + \
834-
azure_auth_names + ssh_names:
835+
azure_auth_names + ssh_names + file_names:
835836
wale[name] = placeholders.get(prefix + name, '')
836837

837838
if wale.get('WAL_S3_BUCKET') or wale.get('WALE_S3_PREFIX') or wale.get('WALG_S3_PREFIX'):
@@ -918,6 +919,8 @@ def write_wale_environment(placeholders, prefix, overwrite):
918919

919920
elif wale.get("WALG_SSH_PREFIX"):
920921
write_envdir_names = ssh_names + walg_names
922+
elif wale.get("WALG_FILE_PREFIX"):
923+
write_envdir_names = file_names + walg_names
921924
else:
922925
return
923926

0 commit comments

Comments
 (0)