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

Define some previously magic numbers

Browse Source
This commit is contained in:
Ian Barwick
2019-02-01 19:14:16 +09:00
parent a41e7bb726
commit 20b79f998c
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbutils.c
View File

@@ -1511,8 +1511,8 @@ get_ready_archive_files(PGconn *conn, const char *data_directory)
log_error(_("unable to access archive_status directory \"%s\""), log_error(_("unable to access archive_status directory \"%s\""),
archive_status_dir); archive_status_dir);
log_detail("%s", strerror(errno)); log_detail("%s", strerror(errno));
/* XXX magic number */
return -1; return ARCHIVE_STATUS_DIR_ERROR;
} }
arcdir = opendir(archive_status_dir); arcdir = opendir(archive_status_dir);
@@ -1522,8 +1522,8 @@ get_ready_archive_files(PGconn *conn, const char *data_directory)
log_error(_("unable to open archive directory \"%s\""), log_error(_("unable to open archive directory \"%s\""),
archive_status_dir); archive_status_dir);
log_detail("%s", strerror(errno)); log_detail("%s", strerror(errno));
/* XXX magic number */
return -1; return ARCHIVE_STATUS_DIR_ERROR;
} }
while ((arcdir_ent = readdir(arcdir)) != NULL) while ((arcdir_ent = readdir(arcdir)) != NULL)

26
repmgr-action-node.c
View File

@@ -221,19 +221,27 @@ do_node_status(void)
ready_files = get_ready_archive_files(conn, data_dir); ready_files = get_ready_archive_files(conn, data_dir);
if (runtime_options.output_mode == OM_CSV) if (ready_files == ARCHIVE_STATUS_DIR_ERROR)
{ {
key_value_list_set_format(&node_status, item_list_append_format(&warnings,
"WALs pending archiving", "- unable to check archive_status directory\n");
"%i",
ready_files);
} }
else else
{ {
key_value_list_set_format(&node_status, if (runtime_options.output_mode == OM_CSV)
"WALs pending archiving", {
"%i pending files", key_value_list_set_format(&node_status,
ready_files); "WALs pending archiving",
"%i",
ready_files);
}
else
{
key_value_list_set_format(&node_status,
"WALs pending archiving",
"%i pending files",
ready_files);
}
} }
if (guc_set(conn, "archive_mode", "=", "off")) if (guc_set(conn, "archive_mode", "=", "off"))

1
repmgr.h
View File

@@ -60,6 +60,7 @@
#define UNKNOWN_NODE_ID -1 #define UNKNOWN_NODE_ID -1
#define MIN_NODE_ID 1 #define MIN_NODE_ID 1
#define VOTING_TERM_NOT_SET -1 #define VOTING_TERM_NOT_SET -1
#define ARCHIVE_STATUS_DIR_ERROR -1
#define BDR2_REPLICATION_SET_NAME "repmgr" #define BDR2_REPLICATION_SET_NAME "repmgr"