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

Next 9.3 compatibility commit. Removed pg_lsn, since it's not available in 9.3.

Browse Source
This commit is contained in:
Josh Berkus
2015-09-03 18:03:25 -07:00
parent 330f9023ee
commit 2b801a3ccc
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
helpers/postgresql.py
+6 -7
View File
@@ -258,7 +258,7 @@ class Postgresql:
member_conn.autocommit = True
member_cursor = member_conn.cursor()
member_cursor.execute(
"SELECT pg_is_in_recovery(), %s - (pg_last_xlog_replay_location() - '0/0000000'::pg_lsn)",
"SELECT pg_is_in_recovery(), %s - pg_xlog_location_diff(pg_last_xlog_replay_location(),'0/0000000')",
(self.xlog_position(), ))
row = member_cursor.fetchone()
member_cursor.close()
@@ -307,10 +307,9 @@ class Postgresql:
recovery_target_timeline = 'latest'
""")
if leader and leader.conn_url:
f.write("""
primary_slot_name = '{}'
primary_conninfo = '{}'
""".format(self.name, self.primary_conninfo(leader.conn_url)))
f.write("""primary_conninfo = '{}'\n""".format(self.primary_conninfo(leader.conn_url)))
if self.use_slots:
f.write("""primary_slot_name = '{}'\n""".format(self.name))
for name, value in self.config.get('recovery_conf', {}).items():
f.write("{} = '{}'\n".format(name, value))
@@ -363,8 +362,8 @@ primary_conninfo = '{}'
def xlog_position(self):
return self.query("""SELECT CASE WHEN pg_is_in_recovery()
THEN pg_last_xlog_replay_location() - '0/0000000'::pg_lsn
ELSE pg_current_xlog_location() - '0/00000'::pg_lsn END""").fetchone()[0]
THEN pg_xlog_location_diff(pg_last_xlog_replay_location(),'0/0000000')
ELSE pg_xlog_location_diff(pg_current_xlog_location(),'0/00000') END""").fetchone()[0]
def load_replication_slots(self):
if self.use_slots: