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

Fix parsing of database connection check results in "standby clone"

Browse Source
This commit is contained in:
Ian Barwick
2020-04-23 13:19:20 +09:00
parent 1628bfb846
commit 971309c830
1 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
repmgr-action-standby.c
View File

@@ -137,7 +137,7 @@ static CheckStatus parse_node_check_archiver(const char *node_check_output, int
static ConnectionStatus parse_remote_node_replication_connection(const char *node_check_output); static ConnectionStatus parse_remote_node_replication_connection(const char *node_check_output);
static bool parse_data_directory_config(const char *node_check_output, t_remote_error_type *remote_error); static bool parse_data_directory_config(const char *node_check_output, t_remote_error_type *remote_error);
static bool parse_replication_config_owner(const char *node_check_output); static bool parse_replication_config_owner(const char *node_check_output);
static CheckStatus parse_db_connection(const char *db_connection);
/* /*
* STANDBY CLONE * STANDBY CLONE
@@ -4183,12 +4183,12 @@ do_standby_switchover(void)
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
status = parse_check_status(command_output.data); status = parse_db_connection(command_output.data);
if (status != CHECK_STATUS_OK) if (status != CHECK_STATUS_OK)
{ {
PQExpBufferData ssh_command; PQExpBufferData ssh_command;
log_error(_("unable to connect locally as superuser \"%s\" on node \"%s\" (ID: %i)"), log_error(_("unable to connect locally as superuser \"%s\" on node \"%s\" (ID: %i)"),
runtime_options.superuser, runtime_options.superuser,
remote_node_record.node_name, remote_node_record.node_name,
remote_node_record.node_id); remote_node_record.node_id);
@@ -8601,7 +8601,7 @@ parse_data_directory_config(const char *node_check_output, t_remote_error_type *
char **argv_array = NULL; char **argv_array = NULL;
int optindex = 0; int optindex = 0;
/* We're only interested in this option */ /* We're only interested in these options */
struct option node_check_options[] = struct option node_check_options[] =
{ {
{"configured-data-directory", required_argument, NULL, 'C'}, {"configured-data-directory", required_argument, NULL, 'C'},
@@ -8660,7 +8660,7 @@ parse_replication_config_owner(const char *node_check_output)
char **argv_array = NULL; char **argv_array = NULL;
int optindex = 0; int optindex = 0;
/* We're only interested in this option */ /* We're only interested in these options */
struct option node_check_options[] = struct option node_check_options[] =
{ {
{"replication-config-owner", required_argument, NULL, 'C'}, {"replication-config-owner", required_argument, NULL, 'C'},
@@ -8703,6 +8703,57 @@ parse_replication_config_owner(const char *node_check_output)
} }
static CheckStatus
parse_db_connection(const char *db_connection)
{
CheckStatus status = CHECK_STATUS_UNKNOWN;
int c = 0,
argc_item = 0;
char **argv_array = NULL;
int optindex = 0;
/* We're only interested in this option */
struct option node_check_options[] =
{
{"db-connection", required_argument, NULL, 'c'},
{NULL, 0, NULL, 0}
};
/* Don't attempt to tokenise an empty string */
if (!strlen(db_connection))
{
return false;
}
argc_item = parse_output_to_argv(db_connection, &argv_array);
/* Reset getopt's optind variable */
optind = 0;
/* Prevent getopt from emitting errors */
opterr = 0;
while ((c = getopt_long(argc_item, argv_array, "c:", node_check_options,
&optindex)) != -1)
{
switch (c)
{
/* --db-connection */
case 'c':
{
status = parse_check_status(optarg);
}
break;
}
}
free_parsed_argv(&argv_array);
return status;
}
void void
do_standby_help(void) do_standby_help(void)
{ {