gitops/patroni
1
0
Fork 0
mirror of https://github.com/outbackdingo/patroni.git synced 2026-08-25 14:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Append values from postgresql.recovery_conf to recovery.conf

Browse Source 
Previously these values were appended only when the leader was known and
it was preventing replica from restoring xlogs with `restore_command`.
This commit is contained in:
Alexander Kukushkin
2016-04-20 15:56:33 +02:00
parent 2ba1b5e206
commit 122895e1d6
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patroni/postgresql.py
+7 -9
View File
@@ -469,17 +469,15 @@ class Postgresql(object):
return pattern and (pattern in line)
return not pattern
def write_recovery_conf(self, leader, bootstrap=False):
def write_recovery_conf(self, leader):
with open(self.recovery_conf, 'w') as f:
f.write("""standby_mode = 'on'
recovery_target_timeline = 'latest'
""")
f.write("standby_mode = 'on'\nrecovery_target_timeline = 'latest'\n")
if leader and leader.conn_url:
f.write("""primary_conninfo = '{0}'\n""".format(self.primary_conninfo(leader.conn_url)))
f.write("primary_conninfo = '{0}'\n".format(self.primary_conninfo(leader.conn_url)))
if self.use_slots:
f.write("""primary_slot_name = '{0}'\n""".format(self.name))
if (leader and leader.conn_url) or bootstrap:
for name, value in self.config.get('recovery_conf', {}).items():
f.write("primary_slot_name = '{0}'\n".format(self.name))
for name, value in self.config.get('recovery_conf', {}).items():
if name not in ('standby_mode', 'recovery_target_timeline', 'primary_conninfo', 'primary_slot_name'):
f.write("{0} = '{1}'\n".format(name, value))
def rewind(self, leader):
@@ -729,7 +727,7 @@ $$""".format(name, options), name, password, password)
else:
if self.sync_replica(clone_member):
self.restore_configuration_files()
self.write_recovery_conf(clone_member, True)
self.write_recovery_conf(clone_member)
ret = self.start()
return ret