openstack/trove
Code Issues Proposed changes

Support renamed postgresql log functions

Browse Source 
In postgres 10 some xlog functions have been renamed [1]

[1] https://wiki.postgresql.org/wiki/New_in_postgres_10

Change-Id: I5b25678dbf495a5f876b7bbd6d7da368dbe5a29c
This commit is contained in:
Sam Morrison 2019-06-21 15:07:00 +10:00
parent 49a11dd9c7
commit 0dba070df7
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
trove/guestagent/datastore/experimental/postgresql/service.py
View File

@ -421,14 +421,24 @@ class PgSqlApp(object):
"""Wrapper for pg_current_xlog_location()
Cannot be used against a running slave
"""
r = self.build_admin().query("SELECT pg_current_xlog_location()")
version = int(self.pg_version[1])
if version < 10:
query = "SELECT pg_current_xlog_location()"
else:
query = "SELECT pg_current_wal_lsn()"
r = self.build_admin().query(query)
return r[0][0]
def pg_last_xlog_replay_location(self):
"""Wrapper for pg_last_xlog_replay_location()
For use on standby servers
"""
r = self.build_admin().query("SELECT pg_last_xlog_replay_location()")
version = int(self.pg_version[1])
if version < 10:
query = "SELECT pg_last_xlog_replay_location()"
else:
query = "SELECT pg_last_wal_replay_lsn()"
r = self.build_admin().query(query)
return r[0][0]
def pg_is_in_recovery(self):
@ -513,8 +523,12 @@ class PgSqlApp(object):
return r[0][0]
def pg_xlogfile_name(self, start_segment):
r = self.build_admin().query(
"SELECT pg_xlogfile_name('%s')" % start_segment)
version = int(self.pg_version[1])
if version < 10:
query = "SELECT pg_xlogfile_name('%s')"
else:
query = "SELECT pg_walfile_name('%s')"
r = self.build_admin().query(query % start_segment)
return r[0][0]
def pg_stop_backup(self):