github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 16:16:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Optionally retrieve server_version string as well

Browse Source 
In a couple of places we'll need to report the human-readable
version number
This commit is contained in:
Ian Barwick
2014-12-29 15:52:53 +09:00
parent f94626bf7b
commit 8b69b1e16f
4 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dbutils.c
View File

@@ -181,20 +181,24 @@ is_pgup(PGconn *conn, int timeout)
* Return the server version number for the connection provided * Return the server version number for the connection provided
*/ */
int int
get_server_version_num(PGconn *conn) get_server_version(PGconn *conn, char *server_version)
{ {
PGresult *res; PGresult *res;
res = PQexec(conn, res = PQexec(conn,
"SELECT current_setting('server_version_num')"); "SELECT current_setting('server_version_num'), "
"current_setting('server_version')");
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
{ {
log_err(_("Unable to determine server verson number:\n%s"), log_err(_("Unable to determine server version number:\n%s"),
PQerrorMessage(conn)); PQerrorMessage(conn));
PQclear(res); PQclear(res);
return -1; return -1;
} }
if(server_version != NULL)
strcpy(server_version, PQgetvalue(res, 0, 0));
return atoi(PQgetvalue(res, 0, 0)); return atoi(PQgetvalue(res, 0, 0));
} }

2
dbutils.h
View File

@@ -30,7 +30,7 @@ PGconn *establish_db_connection_by_params(const char *keywords[],
int is_standby(PGconn *conn); int is_standby(PGconn *conn);
int is_witness(PGconn *conn, char *schema, char *cluster, int node_id); int is_witness(PGconn *conn, char *schema, char *cluster, int node_id);
bool is_pgup(PGconn *conn, int timeout); bool is_pgup(PGconn *conn, int timeout);
int get_server_version_num(PGconn *conn); int get_server_version(PGconn *conn, char *server_version);
int guc_set(PGconn *conn, const char *parameter, const char *op, int guc_set(PGconn *conn, const char *parameter, const char *op,
const char *value); const char *value);
int guc_set_typed(PGconn *conn, const char *parameter, const char *op, int guc_set_typed(PGconn *conn, const char *parameter, const char *op,

30
repmgr.c
View File

@@ -536,7 +536,7 @@ do_master_register(void)
/* Verify that master is a supported server version */ /* Verify that master is a supported server version */
log_info(_("%s connecting to master database\n"), progname); log_info(_("%s connecting to master database\n"), progname);
master_version_num = get_server_version_num(conn); master_version_num = get_server_version(conn, NULL);
if(master_version_num < MIN_SUPPORTED_VERSION_NUM) if(master_version_num < MIN_SUPPORTED_VERSION_NUM)
{ {
PQfinish(conn); PQfinish(conn);
@@ -683,7 +683,10 @@ do_standby_register(void)
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
char schema_quoted[MAXLEN]; char schema_quoted[MAXLEN];
char master_version[MAXVERSIONSTR];
int master_version_num = 0; int master_version_num = 0;
char standby_version[MAXVERSIONSTR];
int standby_version_num = 0; int standby_version_num = 0;
/* XXX: A lot of copied code from do_master_register! Refactor */ /* XXX: A lot of copied code from do_master_register! Refactor */
@@ -692,7 +695,7 @@ do_standby_register(void)
conn = establish_db_connection(options.conninfo, true); conn = establish_db_connection(options.conninfo, true);
/* Verify that standby is a supported server version */ /* Verify that standby is a supported server version */
standby_version_num = get_server_version_num(conn); standby_version_num = get_server_version(conn, master_version);
if(standby_version_num < MIN_SUPPORTED_VERSION_NUM) if(standby_version_num < MIN_SUPPORTED_VERSION_NUM)
{ {
PQfinish(conn); PQfinish(conn);
@@ -765,7 +768,7 @@ do_standby_register(void)
/* Verify that master is a supported server version */ /* Verify that master is a supported server version */
log_info(_("%s connected to master, checking its state\n"), progname); log_info(_("%s connected to master, checking its state\n"), progname);
master_version_num = get_server_version_num(conn); master_version_num = get_server_version(conn, standby_version);
if(master_version_num < MIN_SUPPORTED_VERSION_NUM) if(master_version_num < MIN_SUPPORTED_VERSION_NUM)
{ {
if (master_version_num > 0) if (master_version_num > 0)
@@ -784,8 +787,8 @@ do_standby_register(void)
PQfinish(conn); PQfinish(conn);
PQfinish(master_conn); PQfinish(master_conn);
/* XXX format version numbers */ /* XXX format version numbers */
log_err(_("%s needs versions of both master (%i) and standby (%i) to match.\n"), log_err(_("%s needs versions of both master (%s) and standby (%s) to match.\n"),
progname, master_version_num, standby_version_num); progname, master_version, standby_version);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
@@ -901,7 +904,7 @@ do_standby_clone(void)
/* Verify that master is a supported server version */ /* Verify that master is a supported server version */
log_info(_("%s connected to master, checking its state\n"), progname); log_info(_("%s connected to master, checking its state\n"), progname);
master_version_num = get_server_version_num(conn); master_version_num = get_server_version(conn, NULL);
if(master_version_num < MIN_SUPPORTED_VERSION_NUM) if(master_version_num < MIN_SUPPORTED_VERSION_NUM)
{ {
PQfinish(conn); PQfinish(conn);
@@ -1396,7 +1399,7 @@ do_standby_promote(void)
/* Verify that standby is a supported server version */ /* Verify that standby is a supported server version */
log_info(_("%s connected to standby, checking its state\n"), progname); log_info(_("%s connected to standby, checking its state\n"), progname);
standby_version_num = get_server_version_num(conn); standby_version_num = get_server_version(conn, NULL);
if(standby_version_num < MIN_SUPPORTED_VERSION_NUM) if(standby_version_num < MIN_SUPPORTED_VERSION_NUM)
{ {
PQfinish(conn); PQfinish(conn);
@@ -1505,7 +1508,10 @@ do_standby_follow(void)
retval; retval;
char data_dir[MAXLEN]; char data_dir[MAXLEN];
char master_version[MAXVERSIONSTR];
int master_version_num = 0; int master_version_num = 0;
char standby_version[MAXVERSIONSTR];
int standby_version_num = 0; int standby_version_num = 0;
@@ -1514,7 +1520,7 @@ do_standby_follow(void)
conn = establish_db_connection(options.conninfo, true); conn = establish_db_connection(options.conninfo, true);
/* Verify that standby is a supported server version */ /* Verify that standby is a supported server version */
standby_version_num = get_server_version_num(conn); standby_version_num = get_server_version(conn, master_version);
if(standby_version_num < MIN_SUPPORTED_VERSION_NUM) if(standby_version_num < MIN_SUPPORTED_VERSION_NUM)
{ {
PQfinish(conn); PQfinish(conn);
@@ -1577,7 +1583,7 @@ do_standby_follow(void)
/* Verify that master is a supported server version */ /* Verify that master is a supported server version */
log_info(_("%s connected to master, checking its state\n"), progname); log_info(_("%s connected to master, checking its state\n"), progname);
master_version_num = get_server_version_num(conn); master_version_num = get_server_version(conn, standby_version);
if(master_version_num < MIN_SUPPORTED_VERSION_NUM) if(master_version_num < MIN_SUPPORTED_VERSION_NUM)
{ {
if (master_version_num > 0) if (master_version_num > 0)
@@ -1596,8 +1602,8 @@ do_standby_follow(void)
PQfinish(conn); PQfinish(conn);
PQfinish(master_conn); PQfinish(master_conn);
/* XXX format version numbers */ /* XXX format version numbers */
log_err(_("%s needs versions of both master (%i) and standby (%i) to match.\n"), log_err(_("%s needs versions of both master (%s) and standby (%s) to match.\n"),
progname, master_version_num, standby_version_num); progname, master_version, standby_version);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
@@ -1682,7 +1688,7 @@ do_witness_create(void)
} }
/* Verify that master is a supported server version */ /* Verify that master is a supported server version */
master_version_num = get_server_version_num(masterconn); master_version_num = get_server_version(masterconn, NULL);
if(master_version_num < MIN_SUPPORTED_VERSION_NUM) if(master_version_num < MIN_SUPPORTED_VERSION_NUM)
{ {
PQfinish(masterconn); PQfinish(masterconn);

2
repmgrd.c
View File

@@ -280,7 +280,7 @@ main(int argc, char **argv)
/* Verify that server is a supported version */ /* Verify that server is a supported version */
log_info(_("%s connected to database, checking its state\n"), progname); log_info(_("%s connected to database, checking its state\n"), progname);
server_version_num = get_server_version_num(my_local_conn); server_version_num = get_server_version(my_local_conn, NULL);
if(server_version_num < MIN_SUPPORTED_VERSION_NUM) if(server_version_num < MIN_SUPPORTED_VERSION_NUM)
{ {
if (server_version_num > 0) if (server_version_num > 0)