apply feedback

Author: idanovinda

ENVIRONMENT.rst

@@ -109,12 +109,13 @@ Environment Configuration Settings
 - **KUBERNETES_BOOTSTRAP_LABELS**: a JSON describing names and values of labels used by Patroni as ``kubernetes.bootstrap_labels``. Default is empty.
 - **INITDB_LOCALE**: database cluster's default UTF-8 locale (en_US by default)
 - **ENABLE_WAL_PATH_COMPAT**: old Spilo images were generating wal path in the backup store using the following template ``/spilo/{WAL_BUCKET_SCOPE_PREFIX}{SCOPE}{WAL_BUCKET_SCOPE_SUFFIX}/wal/``, while new images adding one additional directory (``{PGVERSION}``) to the end. In order to avoid (unlikely) issues with restoring WALs (from S3/GC/and so on) when switching to ``spilo-13`` please set the ``ENABLE_WAL_PATH_COMPAT=true`` when deploying old cluster with ``spilo-13`` for the first time. After that the environment variable could be removed. Change of the WAL path also mean that backups stored in the old location will not be cleaned up automatically.
-- **WALG_DISABLE_S3_SSE**: by default wal-g are configured to encrypt files uploaded to S3. In order to disable it you can set this environment variable to ``true``.
+- **WALG_DISABLE_S3_SSE**: by default wal-g is configured to encrypt files uploaded to S3. In order to disable it you can set this environment variable to ``true``.
 - **USE_OLD_LOCALES**: whether to use old locales from Ubuntu 18.04 in the Ubuntu 22.04-based image. Default is false.
 
 wal-g
 -----
 
+wal-g is used everywhere in Spilo to perform backups and restore from them.
 - **WALG_DELTA_MAX_STEPS**, **WALG_DELTA_ORIGIN**, **WALG_DOWNLOAD_CONCURRENCY**, **WALG_UPLOAD_CONCURRENCY**, **WALG_UPLOAD_DISK_CONCURRENCY**, **WALG_DISK_RATE_LIMIT**, **WALG_NETWORK_RATE_LIMIT**, **WALG_COMPRESSION_METHOD**, **WALG_BACKUP_COMPRESSION_METHOD**, **WALG_BACKUP_FROM_REPLICA**, **WALG_SENTINEL_USER_DATA**, **WALG_PREVENT_WAL_OVERWRITE**: (optional) configuration options for wal-g.
 - **WALG_S3_CA_CERT_FILE**: (optional) TLS CA certificate for wal-g (see [wal-g configuration](https://github.com/wal-g/wal-g#configuration))
 - **WALG_SSH_PREFIX**: (optional) the ssh prefix to store WAL backups at in the format ssh://host.example.com/path/to/backups/ See `Wal-g <https://github.com/wal-g/wal-g#configuration>`__ documentation for details.

postgres-appliance/scripts/callback_aws.py

@@ -13,12 +13,12 @@
 
 def get_instance_metadata():
     response = requests.put(
-        url='http://169.254.169.254/latest/api/token',
+        url='http://169.254.169.254/latest/api/token', # AWS EC2 metadata service endpoint to get a token
         headers={'X-aws-ec2-metadata-token-ttl-seconds': '60'}
     )
     token = response.text
     instance_identity = requests.get(
-        url='http://169.254.169.254/latest/dynamic/instance-identity/document',
+        url='http://169.254.169.254/latest/dynamic/instance-identity/document', # AWS EC2 metadata service endpoint to get instance identity document
         headers={'X-aws-ec2-metadata-token': token}
     )
     return instance_identity.json()
@@ -63,12 +63,12 @@ def main():
     )
     ec2 = boto3.client('ec2', config=config)
 
-    if argc == 5 and role in ('master', 'standby_leader') and action in ('on_start', 'on_role_change'):
+    if argc == 5 and role in ('primary', 'standby_leader') and action in ('on_start', 'on_role_change'):
         associate_address(ec2, sys.argv[1], instance_id)
 
     instance = get_instance(ec2, instance_id)
 
-    tags = [{'Key': 'Role', 'Value': role}]
+    tags = [{'Key': 'Role', 'Value': LEADER_TAG_VALUE if role == 'primary' else role}]
     tag_resource(ec2, instance_id, tags)
 
     tags.append({'Key': 'Instance', 'Value': instance_id})
@@ -79,10 +79,7 @@ def main():
             tags_to_update = tags
         else:
             for attachment in v['Attachments']:
-                if attachment['Device'] == instance.get('RootDeviceName'):
-                    volume_device = 'root'
-                else:
-                    volume_device = 'data'
+                volume_device = 'root' if attachment['Device'] == instance.get('RootDeviceName') else 'data'
                 tags_to_update = tags + [{'Key': 'Name', 'Value': 'spilo_{}_{}'.format(cluster, volume_device)}]
 
         tag_resource(ec2, v.get('VolumeId'), tags_to_update)

postgres-appliance/scripts/postgres_backup.sh

@@ -29,7 +29,7 @@ export PGHOST=/var/run/postgresql
 # push a new base backup
 log "producing a new backup"
 # We reduce the priority of the backup for CPU consumption
-nice -n 5 wal-g backup-push "$PGDATA" "${POOL_SIZE[@]}"
+nice -n 5 wal-g backup-push "$PGDATA"
 
 # Collect all backups and sort them by modification time
 mapfile -t backup_records < <(wal-g backup-list 2>/dev/null |