Skip to content

Commit 5a79182

Browse files
authored
Merge pull request #41 from cybertec-postgresql/etcd3
Etcd3
2 parents 7da09c0 + dd227b8 commit 5a79182

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

major_upgrade/pg_upgrade.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
class _PostgresqlUpgrade(Postgresql):
1313

14-
_INCOMPATIBLE_EXTENSIONS = ('pgaudit',)
15-
14+
_INCOMPATIBLE_EXTENSIONS = ('pg_repack',)
15+
1616
def adjust_shared_preload_libraries(self, version):
1717
from spilo_commons import adjust_extensions
1818

@@ -93,7 +93,7 @@ def drop_possibly_incompatible_objects(self):
9393
# cur.execute(cmd)
9494

9595
logger.info('Executing "DROP FUNCTION metric_helpers.pg_stat_statements" in the database="%s"', d)
96-
cur.execute("DROP FUNCTION IF EXISTS metric_helpers.pg_stat_statements(boolean) CASCADE")
96+
function call dur cur.execute("DROP FUNCTION IF EXISTS metric_helpers.pg_stat_statements(boolean) CASCADE")
9797

9898
for ext in ('pg_stat_kcache', 'pg_stat_statements') + self._INCOMPATIBLE_EXTENSIONS:
9999
logger.info('Executing "DROP EXTENSION IF EXISTS %s" in the database="%s"', ext, d)

scripts/configure_spilo.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ def deep_update(a, b):
202202
parameters:
203203
archive_mode: "on"
204204
archive_timeout: 1800s
205-
wal_level: hot_standby
205+
wal_level: replica
206206
wal_log_hints: 'on'
207207
wal_compression: 'on'
208208
max_wal_senders: 10
@@ -220,6 +220,7 @@ def deep_update(a, b):
220220
log_disconnections: 'on'
221221
log_statement: 'ddl'
222222
log_temp_files: 0
223+
password_encryption: 'scram-sha-256'
223224
track_functions: all
224225
checkpoint_completion_target: 0.9
225226
autovacuum_max_workers: 5
@@ -538,9 +539,9 @@ def get_placeholders(provider):
538539
placeholders.setdefault('PGPASSWORD_STANDBY', 'standby')
539540
placeholders.setdefault('USE_ADMIN', 'PGPASSWORD_ADMIN' in placeholders)
540541
placeholders.setdefault('PGUSER_ADMIN', 'admin')
541-
placeholders.setdefault('PGPASSWORD_ADMIN', 'cola')
542+
placeholders.setdefault('PGPASSWORD_ADMIN', 'cpo_defaultAdminPW!')
542543
placeholders.setdefault('PGUSER_SUPERUSER', 'postgres')
543-
placeholders.setdefault('PGPASSWORD_SUPERUSER', 'zalando')
544+
placeholders.setdefault('PGPASSWORD_SUPERUSER', 'cpo_defaultAdminPg')
544545
placeholders.setdefault('ALLOW_NOSSL', '')
545546
placeholders.setdefault('BGMON_LISTEN_IP', '0.0.0.0')
546547
placeholders.setdefault('PGPORT', '5432')
@@ -1084,7 +1085,7 @@ def main():
10841085

10851086
if provider == PROVIDER_LOCAL and not any(1 for key in config.keys() if key in PATRONI_DCS):
10861087
link_runit_service(placeholders, 'etcd')
1087-
config['etcd'] = {'host': '127.0.0.1:2379'}
1088+
config['etcd3'] = {'host': '127.0.0.1:2379'}
10881089

10891090
pgdata = config['postgresql']['data_dir']
10901091
version_file = os.path.join(pgdata, 'PG_VERSION')

0 commit comments

Comments
 (0)