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

Add configuration file parameter for pg_basebackup

Browse Source 
"pg_basebackup_options"
  Enable custom options to be passed to pg_basebackup
  (e.g. --max-rate, --checkpoint, --xlogdir)

"tablespace_mapping"
  Analogue to pg_basebackup's (9.4 and later) -T/--tablespace-mapping
  option.

  Tablespace mapping could also be passed via "pg_basebackup_options",
  however by providing a separate parameter it makes the configuration
  file easier to read and allows us to verify the specified tablespaces
  exist (pg_basebackup won't do this, which can lead to undesired
  behaviour, i.e. attempting to create the tablespace in the original
  path).
This commit is contained in:
Ian Barwick
2015-02-09 10:31:03 +09:00
parent 1d28a2d08e
commit 01a33198fd
2 changed files with 92 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
config.c
View File

@@ -22,6 +22,8 @@
#include "strutil.h"
#include "repmgr.h"
static void tablespace_list_append(t_configuration_options *options, const char *arg);
void
parse_config(const char *config_file, t_configuration_options * options)
{
@@ -45,6 +47,7 @@ parse_config(const char *config_file, t_configuration_options * options)
memset(options->ssh_options, 0, sizeof(options->ssh_options));
memset(options->pg_bindir, 0, sizeof(options->pg_bindir));
memset(options->pgctl_options, 0, sizeof(options->pgctl_options));
memset(options->pg_basebackup_options, 0, sizeof(options->pg_basebackup_options));
/* if nothing has been provided defaults to 60 */
options->master_response_timeout = 60;
@@ -56,6 +59,9 @@ parse_config(const char *config_file, t_configuration_options * options)
options->monitor_interval_secs = 2;
options->retry_promote_interval_secs = 300;
options->tablespace_dirs.head = NULL;
options->tablespace_dirs.tail = NULL;
/*
* Since some commands don't require a config file at all, not having one
* isn't necessarily a problem.
@@ -132,6 +138,8 @@ parse_config(const char *config_file, t_configuration_options * options)
strncpy(options->pg_bindir, value, MAXLEN);
else if (strcmp(name, "pg_ctl_options") == 0)
strncpy(options->pgctl_options, value, MAXLEN);
else if (strcmp(name, "pg_basebackup_options") == 0)
strncpy(options->pg_basebackup_options, value, MAXLEN);
else if (strcmp(name, "logfile") == 0)
strncpy(options->logfile, value, MAXLEN);
else if (strcmp(name, "monitor_interval_secs") == 0)
@@ -140,6 +148,8 @@ parse_config(const char *config_file, t_configuration_options * options)
options->retry_promote_interval_secs = atoi(value);
else if (strcmp(name, "use_replication_slots") == 0)
options->use_replication_slots = atoi(value);
else if (strcmp(name, "tablespace_mapping") == 0)
tablespace_list_append(options, value);
else
log_warning(_("%s/%s: Unknown name/value pair!\n"), name, value);
}
@@ -332,3 +342,71 @@ reload_config(char *config_file, t_configuration_options * orig_options)
return true;
}
/*
* Split argument into old_dir and new_dir and append to tablespace mapping
* list.
*
* Adapted from pg_basebackup.c
*/
static void
tablespace_list_append(t_configuration_options *options, const char *arg)
{
TablespaceListCell *cell;
char *dst;
char *dst_ptr;
const char *arg_ptr;
cell = (TablespaceListCell *) malloc(sizeof(TablespaceListCell));
if(cell == NULL)
{
log_err(_("Unable to allocate memory. Terminating.\n"));
exit(ERR_BAD_CONFIG);
}
dst_ptr = dst = cell->old_dir;
for (arg_ptr = arg; *arg_ptr; arg_ptr++)
{
if (dst_ptr - dst >= MAXPGPATH)
{
log_err(_("directory name too long\n"));
exit(ERR_BAD_CONFIG);
}
if (*arg_ptr == '\\' && *(arg_ptr + 1) == '=')
; /* skip backslash escaping = */
else if (*arg_ptr == '=' && (arg_ptr == arg || *(arg_ptr - 1) != '\\'))
{
if (*cell->new_dir)
{
log_err(_("multiple \"=\" signs in tablespace mapping\n"));
exit(ERR_BAD_CONFIG);
}
else
{
dst = dst_ptr = cell->new_dir;
}
}
else
*dst_ptr++ = *arg_ptr;
}
if (!*cell->old_dir || !*cell->new_dir)
{
log_err(_("invalid tablespace mapping format \"%s\", must be \"OLDDIR=NEWDIR\"\n"),
arg);
exit(ERR_BAD_CONFIG);
}
canonicalize_path(cell->old_dir);
canonicalize_path(cell->new_dir);
if (options->tablespace_dirs.tail)
options->tablespace_dirs.tail->next = cell;
else
options->tablespace_dirs.head = cell;
options->tablespace_dirs.tail = cell;
}

15
config.h
View File

@@ -23,7 +23,18 @@
#include "repmgr.h"
#include "strutil.h"
typedef struct TablespaceListCell
{
struct TablespaceListCell *next;
char old_dir[MAXPGPATH];
char new_dir[MAXPGPATH];
} TablespaceListCell;
typedef struct TablespaceList
{
TablespaceListCell *head;
TablespaceListCell *tail;
} TablespaceList;
typedef struct
{
@@ -45,13 +56,15 @@ typedef struct
int reconnect_intvl;
char pg_bindir[MAXLEN];
char pgctl_options[MAXLEN];
char pg_basebackup_options[MAXLEN];
char logfile[MAXLEN];
int monitor_interval_secs;
int retry_promote_interval_secs;
int use_replication_slots;
TablespaceList tablespace_dirs;
} t_configuration_options;
#define T_CONFIGURATION_OPTIONS_INITIALIZER { "", -1, NO_UPSTREAM_NODE, "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", "", -1, -1, -1, "", "", "", 0, 0, 0 }
#define T_CONFIGURATION_OPTIONS_INITIALIZER { "", -1, NO_UPSTREAM_NODE, "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", "", -1, -1, -1, "", "", "", "", 0, 0, 0, {NULL, NULL} }
void parse_config(const char *config_file, t_configuration_options * options);