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

repmgrd: minor tweaks to witness node synchronisation

Browse Source 
Explicitly roll back if any operation fails, and add debugging output
to track elapsed time between synchronisation intervals.
This commit is contained in:
Ian Barwick
2020-09-01 09:58:14 +09:00
parent 1131e3aad2
commit a88c80248c
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dbutils.c
View File

@@ -3552,11 +3552,21 @@ witness_copy_node_records(PGconn *primary_conn, PGconn *witness_conn)
return false; return false;
} }
get_all_node_records(primary_conn, &nodes); if (get_all_node_records(primary_conn, &nodes) == false)
{
rollback_transaction(witness_conn);
return false;
}
for (cell = nodes.head; cell; cell = cell->next) for (cell = nodes.head; cell; cell = cell->next)
{ {
create_node_record(witness_conn, NULL, cell->node_info); if (create_node_record(witness_conn, NULL, cell->node_info) == false)
{
rollback_transaction(witness_conn);
return false;
}
} }
/* and done */ /* and done */

7
repmgrd-physical.c
View File

@@ -2300,6 +2300,7 @@ monitor_streaming_witness(void)
{ {
log_warning(_("unable to connect to primary")); log_warning(_("unable to connect to primary"));
log_detail("\n%s", PQerrorMessage(primary_conn)); log_detail("\n%s", PQerrorMessage(primary_conn));
/* /*
* Here we're unable to connect to a primary despite having scanned all * Here we're unable to connect to a primary despite having scanned all
* known nodes, so we'll grab the record of the node we think is primary * known nodes, so we'll grab the record of the node we think is primary
@@ -2672,6 +2673,12 @@ loop:
INSTR_TIME_SET_CURRENT(witness_sync_interval_start); INSTR_TIME_SET_CURRENT(witness_sync_interval_start);
} }
else
{
log_debug("seconds since last node record sync: %i (sync interval: %i)",
witness_sync_interval_elapsed,
config_file_options.witness_sync_interval)
}
} }
/* emit "still alive" log message at regular intervals, if requested */ /* emit "still alive" log message at regular intervals, if requested */