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

repmgrd: explicitly state INSERT statement target columns

Browse Source
This commit is contained in:
Ian Barwick
2015-01-12 20:47:22 +09:00
parent 93d5d7905f
commit 1221b73293
1 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
repmgrd.c
View File

@@ -569,9 +569,14 @@ witness_monitor(void)
*/ */
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"INSERT INTO %s.repl_monitor " "INSERT INTO %s.repl_monitor "
"VALUES(%d, %d, '%s'::timestamp with time zone, " " (primary_node, standby_node, "
" NULL, pg_current_xlog_location(), NULL, " " last_monitor_time, last_apply_time, "
" 0, 0) ", " last_wal_primary_location, last_wal_standby_location, "
" replication_lag, apply_lag )"
" VALUES(%d, %d, "
" '%s'::TIMESTAMP WITH TIME ZONE, NULL, "
" pg_current_xlog_location(), NULL, "
" 0, 0) ",
get_repmgr_schema_quoted(my_local_conn), get_repmgr_schema_quoted(my_local_conn),
primary_options.node, primary_options.node,
local_options.node, local_options.node,
@@ -654,10 +659,9 @@ standby_monitor(void)
else else
{ {
log_err( log_err(
_("We haven't found a new master, waiting %i seconds before retry...\n"), _("We haven't found a new master, waiting %i seconds before retry...\n"),
local_options.retry_promote_interval_secs local_options.retry_promote_interval_secs
); );
sleep(local_options.retry_promote_interval_secs); sleep(local_options.retry_promote_interval_secs);
} }
@@ -767,14 +771,18 @@ standby_monitor(void)
*/ */
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"INSERT INTO %s.repl_monitor " "INSERT INTO %s.repl_monitor "
"VALUES(%d, %d, '%s'::timestamp with time zone, " " (primary_node, standby_node, "
"'%s'::timestamp with time zone, '%s', '%s', " " last_monitor_time, last_apply_time, "
"%llu, %llu) ", " last_wal_primary_location, last_wal_standby_location, "
" replication_lag, apply_lag ) "
" VALUES(%d, %d, "
" '%s'::TIMESTAMP WITH TIME ZONE, '%s'::TIMESTAMP WITH TIME ZONE, "
" '%s', '%s', "
" %llu, %llu) ",
get_repmgr_schema_quoted(primary_conn), get_repmgr_schema_quoted(primary_conn),
primary_options.node, local_options.node, monitor_standby_timestamp, primary_options.node, local_options.node,
last_wal_standby_applied_timestamp, monitor_standby_timestamp, last_wal_standby_applied_timestamp,
last_wal_primary_location, last_wal_primary_location, last_wal_standby_received,
last_wal_standby_received,
(long long unsigned int)(lsn_primary - lsn_standby_received), (long long unsigned int)(lsn_primary - lsn_standby_received),
(long long unsigned int)(lsn_standby_received - lsn_standby_applied)); (long long unsigned int)(lsn_standby_received - lsn_standby_applied));
@@ -1317,8 +1325,9 @@ check_node_configuration(void)
log_info(_("%s Adding node %d to cluster '%s'\n"), log_info(_("%s Adding node %d to cluster '%s'\n"),
progname, local_options.node, local_options.cluster_name); progname, local_options.node, local_options.cluster_name);
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
"INSERT INTO %s.repl_nodes " "INSERT INTO %s.repl_nodes"
"VALUES (%d, '%s', '%s', '%s', 0, 'f') ", " (id, cluster, name, conninfo, priority, witness) "
" VALUES (%d, '%s', '%s', '%s', 0, FALSE) ",
get_repmgr_schema_quoted(primary_conn), get_repmgr_schema_quoted(primary_conn),
local_options.node, local_options.node,
local_options.cluster_name, local_options.cluster_name,