From 0ec17603978c1ecf6327833334f3e07853326d26 Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Fri, 15 Feb 2019 13:35:34 +0100 Subject: [PATCH] Don't write primary_conninfo into recovery.conf for wal only standby cluster (#971) It is useless and makes postgres to generate a lot of errors --- patroni/ha.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/patroni/ha.py b/patroni/ha.py index 3989c71b..a7d4ec6d 100644 --- a/patroni/ha.py +++ b/patroni/ha.py @@ -1350,16 +1350,11 @@ class Ha(object): if cluster_params: unique_name = 'remote_master:{}'.format(uuid.uuid1()) - data = { - 'conn_kwargs': { - "host": cluster_params.get('host'), - "port": cluster_params.get('port'), - }, - 'no_replication_slot': 'primary_slot_name' not in cluster_params, - } - data.update({ - k: v for k, v in cluster_params.items() - if k in RemoteMember.allowed_keys() - }) + + data = {k: v for k, v in cluster_params.items() if k in RemoteMember.allowed_keys()} + data['no_replication_slot'] = 'primary_slot_name' not in cluster_params + conn_kwargs = {k: cluster_params[k] for k in ('host', 'port') if k in cluster_params} + if conn_kwargs: + data['conn_kwargs'] = conn_kwargs return RemoteMember(unique_name, data)