From f093cae18d5d4975440d2fb38c73e5596453ca29 Mon Sep 17 00:00:00 2001 From: matthias Date: Thu, 11 Jul 2024 08:10:21 +0200 Subject: [PATCH 1/3] changed local etcd to v3 in patroni-template --- major_upgrade/pg_upgrade.py | 6 +++--- scripts/configure_spilo.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/major_upgrade/pg_upgrade.py b/major_upgrade/pg_upgrade.py index 57010a1..78a5f1a 100644 --- a/major_upgrade/pg_upgrade.py +++ b/major_upgrade/pg_upgrade.py @@ -11,8 +11,8 @@ class _PostgresqlUpgrade(Postgresql): - _INCOMPATIBLE_EXTENSIONS = ('pgaudit',) - + _INCOMPATIBLE_EXTENSIONS = ('pg_repack',) + def adjust_shared_preload_libraries(self, version): from spilo_commons import adjust_extensions @@ -93,7 +93,7 @@ def drop_possibly_incompatible_objects(self): # cur.execute(cmd) logger.info('Executing "DROP FUNCTION metric_helpers.pg_stat_statements" in the database="%s"', d) - cur.execute("DROP FUNCTION IF EXISTS metric_helpers.pg_stat_statements(boolean) CASCADE") + function call dur cur.execute("DROP FUNCTION IF EXISTS metric_helpers.pg_stat_statements(boolean) CASCADE") for ext in ('pg_stat_kcache', 'pg_stat_statements') + self._INCOMPATIBLE_EXTENSIONS: logger.info('Executing "DROP EXTENSION IF EXISTS %s" in the database="%s"', ext, d) diff --git a/scripts/configure_spilo.py b/scripts/configure_spilo.py index e8064ea..2469e6b 100755 --- a/scripts/configure_spilo.py +++ b/scripts/configure_spilo.py @@ -1083,8 +1083,8 @@ def main(): config = deep_update(user_config_copy, config) if provider == PROVIDER_LOCAL and not any(1 for key in config.keys() if key in PATRONI_DCS): - link_runit_service(placeholders, 'etcd') - config['etcd'] = {'host': '127.0.0.1:2379'} + link_runit_service(placeholders, 'etcd3') + config['etcd3'] = {'host': '127.0.0.1:2379'} pgdata = config['postgresql']['data_dir'] version_file = os.path.join(pgdata, 'PG_VERSION') From 547fd8fa2f88ee6e5b00ced1a6fa7c4cf1bae2f1 Mon Sep 17 00:00:00 2001 From: matthias Date: Thu, 11 Jul 2024 10:21:28 +0200 Subject: [PATCH 2/3] fix etcdv3 for local etcd and modify parameters --- scripts/configure_spilo.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/configure_spilo.py b/scripts/configure_spilo.py index 2469e6b..a935b58 100755 --- a/scripts/configure_spilo.py +++ b/scripts/configure_spilo.py @@ -202,7 +202,7 @@ def deep_update(a, b): parameters: archive_mode: "on" archive_timeout: 1800s - wal_level: hot_standby + wal_level: replica wal_log_hints: 'on' wal_compression: 'on' max_wal_senders: 10 @@ -220,6 +220,7 @@ def deep_update(a, b): log_disconnections: 'on' log_statement: 'ddl' log_temp_files: 0 + password_encryption: 'scram-sha-256' track_functions: all checkpoint_completion_target: 0.9 autovacuum_max_workers: 5 @@ -538,9 +539,9 @@ def get_placeholders(provider): placeholders.setdefault('PGPASSWORD_STANDBY', 'standby') placeholders.setdefault('USE_ADMIN', 'PGPASSWORD_ADMIN' in placeholders) placeholders.setdefault('PGUSER_ADMIN', 'admin') - placeholders.setdefault('PGPASSWORD_ADMIN', 'cola') + placeholders.setdefault('PGPASSWORD_ADMIN', 'cpo_ChangeMeAdmin!') placeholders.setdefault('PGUSER_SUPERUSER', 'postgres') - placeholders.setdefault('PGPASSWORD_SUPERUSER', 'zalando') + placeholders.setdefault('PGPASSWORD_SUPERUSER', 'cpo_ChangeMePG') placeholders.setdefault('ALLOW_NOSSL', '') placeholders.setdefault('BGMON_LISTEN_IP', '0.0.0.0') placeholders.setdefault('PGPORT', '5432') @@ -1083,7 +1084,7 @@ def main(): config = deep_update(user_config_copy, config) if provider == PROVIDER_LOCAL and not any(1 for key in config.keys() if key in PATRONI_DCS): - link_runit_service(placeholders, 'etcd3') + link_runit_service(placeholders, 'etcd') config['etcd3'] = {'host': '127.0.0.1:2379'} pgdata = config['postgresql']['data_dir'] From dd227b8682d59eab5b599eb57953126852101af2 Mon Sep 17 00:00:00 2001 From: matthias Date: Thu, 11 Jul 2024 11:07:51 +0200 Subject: [PATCH 3/3] changed def pw in template --- scripts/configure_spilo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/configure_spilo.py b/scripts/configure_spilo.py index a935b58..08f1c27 100755 --- a/scripts/configure_spilo.py +++ b/scripts/configure_spilo.py @@ -539,9 +539,9 @@ def get_placeholders(provider): placeholders.setdefault('PGPASSWORD_STANDBY', 'standby') placeholders.setdefault('USE_ADMIN', 'PGPASSWORD_ADMIN' in placeholders) placeholders.setdefault('PGUSER_ADMIN', 'admin') - placeholders.setdefault('PGPASSWORD_ADMIN', 'cpo_ChangeMeAdmin!') + placeholders.setdefault('PGPASSWORD_ADMIN', 'cpo_defaultAdminPW!') placeholders.setdefault('PGUSER_SUPERUSER', 'postgres') - placeholders.setdefault('PGPASSWORD_SUPERUSER', 'cpo_ChangeMePG') + placeholders.setdefault('PGPASSWORD_SUPERUSER', 'cpo_defaultAdminPg') placeholders.setdefault('ALLOW_NOSSL', '') placeholders.setdefault('BGMON_LISTEN_IP', '0.0.0.0') placeholders.setdefault('PGPORT', '5432')