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

Rename copy_configuration () to witness_copy_node_records()

Browse Source 
As it's witness-specific. Per suggestion from Martín.
This commit is contained in:
Ian Barwick
2016-04-01 08:44:23 +09:00
parent de5908c122
commit dd6ea1cd77
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbutils.c
View File

@@ -1111,7 +1111,7 @@ set_config_bool(PGconn *conn, const char *config_param, bool state)
/* /*
* copy_configuration() * witness_copy_node_records()
* *
* Copy records in master's `repl_nodes` table to witness database * Copy records in master's `repl_nodes` table to witness database
* *
@@ -1119,7 +1119,7 @@ set_config_bool(PGconn *conn, const char *config_param, bool state)
* `repmgrd` after a failover event occurs * `repmgrd` after a failover event occurs
*/ */
bool bool
copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name) witness_copy_node_records(PGconn *masterconn, PGconn *witnessconn, char *cluster_name)
{ {
char sqlquery[MAXLEN]; char sqlquery[MAXLEN];
PGresult *res; PGresult *res;
@@ -1129,7 +1129,7 @@ copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name)
sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_nodes", get_repmgr_schema_quoted(witnessconn)); sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_nodes", get_repmgr_schema_quoted(witnessconn));
log_verbose(LOG_DEBUG, "copy_configuration():\n%s\n", sqlquery); log_verbose(LOG_DEBUG, "witness_copy_node_records():\n%s\n", sqlquery);
res = PQexec(witnessconn, sqlquery); res = PQexec(witnessconn, sqlquery);
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -1143,7 +1143,7 @@ copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name)
"SELECT id, type, upstream_node_id, name, conninfo, priority, slot_name, active FROM %s.repl_nodes", "SELECT id, type, upstream_node_id, name, conninfo, priority, slot_name, active FROM %s.repl_nodes",
get_repmgr_schema_quoted(masterconn)); get_repmgr_schema_quoted(masterconn));
log_verbose(LOG_DEBUG, "copy_configuration():\n%s\n", sqlquery); log_verbose(LOG_DEBUG, "witness_copy_node_records():\n%s\n", sqlquery);
res = PQexec(masterconn, sqlquery); res = PQexec(masterconn, sqlquery);
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -1161,12 +1161,12 @@ copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name)
bool node_record_created; bool node_record_created;
log_verbose(LOG_DEBUG, log_verbose(LOG_DEBUG,
"copy_configuration(): writing node record for node %s (id: %s)\n", "witness_copy_node_records(): writing node record for node %s (id: %s)\n",
PQgetvalue(res, i, 3), PQgetvalue(res, i, 3),
PQgetvalue(res, i, 0)); PQgetvalue(res, i, 0));
node_record_created = create_node_record(witnessconn, node_record_created = create_node_record(witnessconn,
"copy_configuration", "witness_copy_node_records",
atoi(PQgetvalue(res, i, 0)), atoi(PQgetvalue(res, i, 0)),
PQgetvalue(res, i, 1), PQgetvalue(res, i, 1),
strlen(PQgetvalue(res, i, 2)) strlen(PQgetvalue(res, i, 2))

2
dbutils.h
View File

@@ -121,7 +121,7 @@ bool drop_replication_slot(PGconn *conn, char *slot_name);
bool start_backup(PGconn *conn, char *first_wal_segment, bool fast_checkpoint); bool start_backup(PGconn *conn, char *first_wal_segment, bool fast_checkpoint);
bool stop_backup(PGconn *conn, char *last_wal_segment); bool stop_backup(PGconn *conn, char *last_wal_segment);
bool set_config_bool(PGconn *conn, const char *config_param, bool state); bool set_config_bool(PGconn *conn, const char *config_param, bool state);
bool copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name); bool witness_copy_node_records(PGconn *masterconn, PGconn *witnessconn, char *cluster_name);
bool create_node_record(PGconn *conn, char *action, int node, char *type, int upstream_node, char *cluster_name, char *node_name, char *conninfo, int priority, char *slot_name, bool active); bool create_node_record(PGconn *conn, char *action, int node, char *type, int upstream_node, char *cluster_name, char *node_name, char *conninfo, int priority, char *slot_name, bool active);
bool delete_node_record(PGconn *conn, int node, char *action); bool delete_node_record(PGconn *conn, int node, char *action);
int get_node_record(PGconn *conn, char *cluster, int node_id, t_node_info *node_info); int get_node_record(PGconn *conn, char *cluster, int node_id, t_node_info *node_info);

2
repmgr.c
View File

@@ -3808,7 +3808,7 @@ do_witness_create(void)
/* copy configuration from master, only repl_nodes is needed */ /* copy configuration from master, only repl_nodes is needed */
if (!copy_configuration(masterconn, witnessconn, options.cluster_name)) if (!witness_copy_node_records(masterconn, witnessconn, options.cluster_name))
{ {
create_event_record(masterconn, create_event_record(masterconn,
&options, &options,

4
repmgrd.c
View File

@@ -488,7 +488,7 @@ main(int argc, char **argv)
if(sync_repl_nodes_elapsed >= local_options.witness_repl_nodes_sync_interval_secs) if(sync_repl_nodes_elapsed >= local_options.witness_repl_nodes_sync_interval_secs)
{ {
log_debug(_("Resyncing repl_nodes table\n")); log_debug(_("Resyncing repl_nodes table\n"));
copy_configuration(master_conn, my_local_conn, local_options.cluster_name); witness_copy_node_records(master_conn, my_local_conn, local_options.cluster_name);
sync_repl_nodes_elapsed = 0; sync_repl_nodes_elapsed = 0;
} }
} }
@@ -600,7 +600,7 @@ witness_monitor(void)
* XXX it would be neat to be able to handle this with e.g. table-based * XXX it would be neat to be able to handle this with e.g. table-based
* logical replication * logical replication
*/ */
copy_configuration(master_conn, my_local_conn, local_options.cluster_name); witness_copy_node_records(master_conn, my_local_conn, local_options.cluster_name);
break; break;
} }