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

Store configuration file in repmgr.nodes table

Browse Source 
When executing repmgr on remote nodes, we otherwise end up jumping
through hoops as we can't make assumptions about where the configuration
file is located, but really need to be able to provide it.

From a support point of view it will also make life easier as it will
be easy to specify exactly which file to provide.
This commit is contained in:
Ian Barwick
2017-08-10 08:03:24 +09:00
parent a57fb5b50c
commit 1d99a07b43
6 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configfile.c
View File

@@ -11,7 +11,7 @@
#include "log.h" #include "log.h"
const static char *_progname = NULL; const static char *_progname = NULL;
static char config_file_path[MAXPGPATH]; char config_file_path[MAXPGPATH] = "";
static bool config_file_provided = false; static bool config_file_provided = false;
bool config_file_found = false; bool config_file_found = false;

1
configfile.h
View File

@@ -13,6 +13,7 @@
#define CONFIG_FILE_NAME "repmgr.conf" #define CONFIG_FILE_NAME "repmgr.conf"
#define MAXLINELENGTH 4096 #define MAXLINELENGTH 4096
extern bool config_file_found; extern bool config_file_found;
extern char config_file_path[MAXPGPATH];
typedef enum { typedef enum {
FAILOVER_MANUAL, FAILOVER_MANUAL,

16
dbutils.c
View File

@@ -1637,7 +1637,7 @@ get_node_record(PGconn *conn, int node_id, t_node_info *node_info)
" WHERE node_id = %i", " WHERE node_id = %i",
node_id); node_id);
log_verbose(LOG_DEBUG, "get_node_record():\n%s", query.data); log_verbose(LOG_DEBUG, "get_node_record():\n %s", query.data);
result = _get_node_record(conn, query.data, node_info); result = _get_node_record(conn, query.data, node_info);
termPQExpBuffer(&query); termPQExpBuffer(&query);
@@ -1956,7 +1956,7 @@ _create_update_node_record(PGconn *conn, char *action, t_node_info *node_info)
char *slot_name_ptr = NULL; char *slot_name_ptr = NULL;
int param_count = 10; int param_count = 11;
const char *param_values[param_count]; const char *param_values[param_count];
PGresult *res; PGresult *res;
@@ -1995,7 +1995,8 @@ _create_update_node_record(PGconn *conn, char *action, t_node_info *node_info)
param_values[6] = node_info->location; param_values[6] = node_info->location;
param_values[7] = priority; param_values[7] = priority;
param_values[8] = node_info->active == true ? "TRUE" : "FALSE"; param_values[8] = node_info->active == true ? "TRUE" : "FALSE";
param_values[9] = node_id; param_values[9] = node_info->config_file;
param_values[10] = node_id;
initPQExpBuffer(&query); initPQExpBuffer(&query);
@@ -2005,8 +2006,8 @@ _create_update_node_record(PGconn *conn, char *action, t_node_info *node_info)
"INSERT INTO repmgr.nodes " "INSERT INTO repmgr.nodes "
" (node_id, type, upstream_node_id, " " (node_id, type, upstream_node_id, "
" node_name, conninfo, repluser, slot_name, " " node_name, conninfo, repluser, slot_name, "
" location, priority, active) " " location, priority, active, config_file) "
"VALUES ($10, $1, $2, $3, $4, $5, $6, $7, $8, $9) "); "VALUES ($11, $1, $2, $3, $4, $5, $6, $7, $8, $9, $10) ");
} }
else else
{ {
@@ -2020,8 +2021,9 @@ _create_update_node_record(PGconn *conn, char *action, t_node_info *node_info)
" slot_name = $6, " " slot_name = $6, "
" location = $7, " " location = $7, "
" priority = $8, " " priority = $8, "
" active = $9 " " active = $9, "
" WHERE node_id = $10 "); " config_file = $10 "
" WHERE node_id = $11 ");
} }

4
dbutils.h
View File

@@ -15,7 +15,7 @@
#include "strutil.h" #include "strutil.h"
#include "voting.h" #include "voting.h"
#define REPMGR_NODES_COLUMNS "node_id, type, upstream_node_id, node_name, conninfo, repluser, slot_name, location, priority, active, '' AS upstream_node_name " #define REPMGR_NODES_COLUMNS "node_id, type, upstream_node_id, node_name, conninfo, repluser, slot_name, location, priority, active, config_file, '' AS upstream_node_name "
typedef enum { typedef enum {
UNKNOWN = 0, UNKNOWN = 0,
@@ -84,6 +84,7 @@ typedef struct s_node_info
int priority; int priority;
bool active; bool active;
char slot_name[MAXLEN]; char slot_name[MAXLEN];
char config_file[MAXPGPATH];
/* used during failover to track node status */ /* used during failover to track node status */
XLogRecPtr last_wal_receive_lsn; XLogRecPtr last_wal_receive_lsn;
NodeStatus node_status; NodeStatus node_status;
@@ -115,6 +116,7 @@ typedef struct s_node_info
DEFAULT_PRIORITY, \ DEFAULT_PRIORITY, \
true, \ true, \
"", \ "", \
"", \
/* used during failover to track node status */ \ /* used during failover to track node status */ \
InvalidXLogRecPtr, \ InvalidXLogRecPtr, \
NODE_STATUS_UNKNOWN, \ NODE_STATUS_UNKNOWN, \

3
repmgr--4.0.sql
View File

@@ -11,7 +11,8 @@ CREATE TABLE nodes (
priority INT NOT NULL DEFAULT 100, priority INT NOT NULL DEFAULT 100,
conninfo TEXT NOT NULL, conninfo TEXT NOT NULL,
repluser VARCHAR(63) NOT NULL, repluser VARCHAR(63) NOT NULL,
slot_name TEXT NULL slot_name TEXT NULL,
config_file TEXT NOT NULL
); );
CREATE TABLE events ( CREATE TABLE events (

1
repmgr-client.c
View File

@@ -2971,6 +2971,7 @@ init_node_record(t_node_info *node_record)
strncpy(node_record->node_name, config_file_options.node_name, MAXLEN); strncpy(node_record->node_name, config_file_options.node_name, MAXLEN);
strncpy(node_record->conninfo, config_file_options.conninfo, MAXLEN); strncpy(node_record->conninfo, config_file_options.conninfo, MAXLEN);
strncpy(node_record->config_file, config_file_path, MAXLEN);
if (config_file_options.replication_user[0] != '\0') if (config_file_options.replication_user[0] != '\0')
{ {