Skip to content

Etcd3 #41

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

Merged
Schmaetz merged 3 commits into from
Jul 11, 2024
Merged

Etcd3 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f093cae
changed local etcd to v3 in patroni-template
Schmaetz Jul 11, 2024
547fd8f
fix etcdv3 for local etcd and modify parameters
Schmaetz Jul 11, 2024
dd227b8
changed def pw in template
Schmaetz Jul 11, 2024
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
6 changes: 3 additions & 3 deletions major_upgrade/pg_upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down
9 changes: 5 additions & 4 deletions scripts/configure_spilo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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_defaultAdminPW!')
placeholders.setdefault('PGUSER_SUPERUSER', 'postgres')
placeholders.setdefault('PGPASSWORD_SUPERUSER', 'zalando')
placeholders.setdefault('PGPASSWORD_SUPERUSER', 'cpo_defaultAdminPg')
placeholders.setdefault('ALLOW_NOSSL', '')
placeholders.setdefault('BGMON_LISTEN_IP', '0.0.0.0')
placeholders.setdefault('PGPORT', '5432')
Expand Down Expand Up @@ -1084,7 +1085,7 @@ def main():

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'}
config['etcd3'] = {'host': '127.0.0.1:2379'}

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