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

repmgrd: check shared library is loaded

Browse Source 
If this isn't the case, "repmgrd" will appear to run but not handle
failover correctly.

Address GitHub #337.
This commit is contained in:
Ian Barwick
2017-11-10 14:35:17 +09:00
parent cbc97d84ac
commit 4d6dc57589
4 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
dbutils.c
View File

@@ -1554,7 +1554,7 @@ repmgrd_set_local_node_id(PGconn *conn, int local_node_id)
initPQExpBuffer(&query); initPQExpBuffer(&query);
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
" SELECT repmgr.set_local_node_id(%i)", "SELECT repmgr.set_local_node_id(%i)",
local_node_id); local_node_id);
res = PQexec(conn, query.data); res = PQexec(conn, query.data);
@@ -1572,6 +1572,26 @@ repmgrd_set_local_node_id(PGconn *conn, int local_node_id)
int
repmgrd_get_local_node_id(PGconn *conn)
{
PGresult *res = NULL;
int local_node_id = UNKNOWN_NODE_ID;
res = PQexec(conn, "SELECT repmgr.get_local_node_id()");
if (!PQgetisnull(res, 0, 0))
{
local_node_id = atoi(PQgetvalue(res, 0, 0));
}
PQclear(res);
return local_node_id;
}
/* ================ */ /* ================ */
/* result functions */ /* result functions */
/* ================ */ /* ================ */

1
dbutils.h
View File

@@ -382,6 +382,7 @@ bool can_use_pg_rewind(PGconn *conn, const char *data_directory, PQExpBufferDat
int get_ready_archive_files(PGconn *conn, const char *data_directory); int get_ready_archive_files(PGconn *conn, const char *data_directory);
bool identify_system(PGconn *repl_conn, t_system_identification *identification); bool identify_system(PGconn *repl_conn, t_system_identification *identification);
bool repmgrd_set_local_node_id(PGconn *conn, int local_node_id); bool repmgrd_set_local_node_id(PGconn *conn, int local_node_id);
int repmgrd_get_local_node_id(PGconn *conn);
/* extension functions */ /* extension functions */
ExtensionStatus get_repmgr_extension_status(PGconn *conn); ExtensionStatus get_repmgr_extension_status(PGconn *conn);

1
repmgr.c
View File

@@ -124,7 +124,6 @@ _PG_init(void)
{ {
elog(DEBUG1, "repmgr init"); elog(DEBUG1, "repmgr init");
/* error here? */
if (!process_shared_preload_libraries_in_progress) if (!process_shared_preload_libraries_in_progress)
return; return;

18
repmgrd.c
View File

@@ -332,6 +332,24 @@ main(int argc, char **argv)
repmgrd_set_local_node_id(local_conn, config_file_options.node_id); repmgrd_set_local_node_id(local_conn, config_file_options.node_id);
{
/*
* sanity-check that the shared library is loaded and shared memory
* can be written by attempting to retrieve the previously stored node_id
*/
int stored_local_node_id = UNKNOWN_NODE_ID;
stored_local_node_id = repmgrd_get_local_node_id(local_conn);
if (stored_local_node_id == UNKNOWN_NODE_ID)
{
log_error(_("unable to write to shared memory"));
log_hint(_("ensure \"shared_preload_libraries\" includes \"repmgr\""));
PQfinish(local_conn);
terminate(ERR_BAD_CONFIG);
}
}
if (config_file_options.replication_type == REPLICATION_TYPE_BDR) if (config_file_options.replication_type == REPLICATION_TYPE_BDR)
{ {
log_debug("node id is %i", local_node_info.node_id); log_debug("node id is %i", local_node_info.node_id);