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

Consolidate repl_node insert statements

Browse Source
This commit is contained in:
Ian Barwick
2015-01-09 11:14:47 +09:00
parent f2fa60f5cf
commit 17de82493a
1 changed files with 97 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
repmgr.c
View File

@@ -65,6 +65,7 @@ static void write_primary_conninfo(char *line);
static bool write_recovery_file_line(FILE *recovery_file, char *recovery_file_path, char *line); static bool write_recovery_file_line(FILE *recovery_file, char *recovery_file_path, char *line);
static int check_server_version(PGconn *conn, char *server_type, bool exit_on_error, char *server_version_string); static int check_server_version(PGconn *conn, char *server_type, bool exit_on_error, char *server_version_string);
static bool check_master_config(PGconn *conn, bool exit_on_error); static bool check_master_config(PGconn *conn, bool exit_on_error);
static bool create_node_record(PGconn *conn, char *action, int node, char *cluster_name, char *node_name, char *conninfo, int priority, bool witness);
static void do_master_register(void); static void do_master_register(void);
static void do_standby_register(void); static void do_standby_register(void);
@@ -550,6 +551,8 @@ do_master_register(void)
char schema_quoted[MAXLEN]; char schema_quoted[MAXLEN];
int ret; int ret;
bool node_record_created;
conn = establish_db_connection(options.conninfo, true); conn = establish_db_connection(options.conninfo, true);
/* Verify that master is a supported server version */ /* Verify that master is a supported server version */
@@ -657,29 +660,20 @@ do_master_register(void)
} }
/* Now register the master */ /* Now register the master */
node_record_created = create_node_record(conn,
sqlquery_snprintf(sqlquery, "master register",
"INSERT INTO %s.repl_nodes (id, cluster, name, conninfo, priority) " options.node,
"VALUES (%d, '%s', '%s', '%s', %d) ", options.cluster_name,
repmgr_schema, options.node_name,
options.node, options.conninfo,
options.cluster_name, options.priority,
options.node_name, false);
options.conninfo,
options.priority);
log_debug(_("master register: %s\n"), sqlquery);
res = PQexec(conn, sqlquery);
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
{
log_warning(_("Cannot insert node details, %s\n"),
PQerrorMessage(conn));
PQfinish(conn);
exit(ERR_BAD_CONFIG);
}
PQclear(res);
PQfinish(conn); PQfinish(conn);
if(node_record_created == false)
exit(ERR_DB_QUERY);
log_notice(_("Master node correctly registered for cluster %s with id %d (conninfo: %s)\n"), log_notice(_("Master node correctly registered for cluster %s with id %d (conninfo: %s)\n"),
options.cluster_name, options.node, options.conninfo); options.cluster_name, options.node, options.conninfo);
return; return;
@@ -704,6 +698,8 @@ do_standby_register(void)
char standby_version[MAXVERSIONSTR]; char standby_version[MAXVERSIONSTR];
int standby_version_num = 0; int standby_version_num = 0;
bool node_record_created;
/* XXX: A lot of copied code from do_master_register! Refactor */ /* XXX: A lot of copied code from do_master_register! Refactor */
log_info(_("%s connecting to standby database\n"), progname); log_info(_("%s connecting to standby database\n"), progname);
@@ -816,31 +812,22 @@ do_standby_register(void)
PQclear(res); PQclear(res);
} }
sqlquery_snprintf(sqlquery, node_record_created = create_node_record(master_conn,
"INSERT INTO %s.repl_nodes(id, cluster, name, conninfo, priority) " "standby register",
"VALUES (%d, '%s', '%s', '%s', %d) ", options.node,
repmgr_schema, options.cluster_name,
options.node, options.node_name,
options.cluster_name, options.conninfo,
options.node_name, options.priority,
options.conninfo, false);
options.priority);
log_debug(_("standby register: %s\n"), sqlquery);
res = PQexec(master_conn, sqlquery);
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
{
log_err(_("Cannot insert node details, %s\n"),
PQerrorMessage(master_conn));
PQfinish(master_conn);
PQfinish(conn);
exit(ERR_BAD_CONFIG);
}
log_info(_("%s registering the standby complete\n"), progname);
PQfinish(master_conn); PQfinish(master_conn);
PQfinish(conn); PQfinish(conn);
if(node_record_created == false)
exit(ERR_BAD_CONFIG);
log_info(_("%s registering the standby complete\n"), progname);
log_notice(_("Standby node correctly registered for cluster %s with id %d (conninfo: %s)\n"), log_notice(_("Standby node correctly registered for cluster %s with id %d (conninfo: %s)\n"),
options.cluster_name, options.node, options.conninfo); options.cluster_name, options.node, options.conninfo);
return; return;
@@ -1444,6 +1431,7 @@ do_witness_create(void)
char master_hba_file[MAXLEN]; char master_hba_file[MAXLEN];
bool success; bool success;
bool node_record_created;
/* Connection parameters for master only */ /* Connection parameters for master only */
keywords[0] = "host"; keywords[0] = "host";
@@ -1625,22 +1613,18 @@ do_witness_create(void)
} }
/* register ourselves in the master */ /* register ourselves in the master */
sqlquery_snprintf(sqlquery,
"INSERT INTO %s.repl_nodes(id, cluster, name, conninfo, priority, witness) "
"VALUES (%d, '%s', '%s', '%s', %d, true) ",
repmgr_schema,
options.node,
options.cluster_name,
options.node_name,
options.conninfo,
options.priority);
log_debug(_("witness create: %s"), sqlquery); node_record_created = create_node_record(masterconn,
res = PQexec(masterconn, sqlquery); "witness create",
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK) options.node,
options.cluster_name,
options.node_name,
options.conninfo,
options.priority,
true);
if(node_record_created == false)
{ {
log_err(_("Cannot insert node details, %s\n"),
PQerrorMessage(masterconn));
PQfinish(masterconn); PQfinish(masterconn);
exit(ERR_DB_QUERY); exit(ERR_DB_QUERY);
} }
@@ -2244,13 +2228,16 @@ create_schema(PGconn *conn)
return true; return true;
} }
/*
* copy_configuration()
*
* Copy record's in master's `repl_nodes` table to witness database
*/
static bool static bool
copy_configuration(PGconn *masterconn, PGconn *witnessconn) copy_configuration(PGconn *masterconn, PGconn *witnessconn)
{ {
char sqlquery[MAXLEN]; char sqlquery[MAXLEN];
PGresult *res1; PGresult *res1;
PGresult *res2;
int i; int i;
sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_nodes", repmgr_schema); sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_nodes", repmgr_schema);
@@ -2276,26 +2263,25 @@ copy_configuration(PGconn *masterconn, PGconn *witnessconn)
} }
for (i = 0; i < PQntuples(res1); i++) for (i = 0; i < PQntuples(res1); i++)
{ {
sqlquery_snprintf(sqlquery, bool node_record_created;
"INSERT INTO %s.repl_nodes(id, cluster, name, conninfo, priority, witness) " char *witness = PQgetvalue(res1, i, 4);
"VALUES (%d, '%s', '%s', '%s', %d, '%s') ",
repmgr_schema,
atoi(PQgetvalue(res1, i, 0)),
options.cluster_name,
PQgetvalue(res1, i, 1),
PQgetvalue(res1, i, 2),
atoi(PQgetvalue(res1, i, 3)),
PQgetvalue(res1, i, 4));
res2 = PQexec(witnessconn, sqlquery); node_record_created = create_node_record(witnessconn,
if (!res2 || PQresultStatus(res2) != PGRES_COMMAND_OK) NULL,
atoi(PQgetvalue(res1, i, 0)),
options.cluster_name,
PQgetvalue(res1, i, 1),
PQgetvalue(res1, i, 2),
atoi(PQgetvalue(res1, i, 3)),
strcmp(witness, "t") ? true : false);
if (node_record_created == false)
{ {
fprintf(stderr, "Cannot copy configuration to witness, %s\n", fprintf(stderr, "Unable to create node record for witness: %s\n",
PQerrorMessage(witnessconn)); PQerrorMessage(witnessconn));
PQclear(res2);
return false; return false;
} }
PQclear(res2);
} }
PQclear(res1); PQclear(res1);
@@ -2548,3 +2534,40 @@ do_check_master_config(void)
PQfinish(conn); PQfinish(conn);
} }
static bool
create_node_record(PGconn *conn, char *action, int node, char *cluster_name, char *node_name, char *conninfo, int priority, bool witness)
{
char sqlquery[QUERY_STR_LEN];
PGresult *res;
sqlquery_snprintf(sqlquery,
"INSERT INTO %s.repl_nodes "
" (id, cluster, name, conninfo, priority, witness) "
"VALUES (%d, '%s', '%s', '%s', %d, %s) ",
repmgr_schema,
node,
cluster_name,
node_name,
conninfo,
priority,
witness == true ? "TRUE" : "FALSE");
if(action != NULL)
{
log_debug(_("%s: %s\n"), action, sqlquery);
}
res = PQexec(conn, sqlquery);
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
{
log_warning(_("Cannot insert node details, %s\n"),
PQerrorMessage(conn));
return false;
}
PQclear(res);
return true;
}