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

Cleanup various #defines

Browse Source
This commit is contained in:
Ian Barwick
2017-08-10 15:11:53 +09:00
parent 970ed5d959
commit 4f2161bd83
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbutils.h
View File

@@ -17,6 +17,8 @@
#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 " #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 "
#define ERRBUFF_SIZE 512
typedef enum { typedef enum {
UNKNOWN = 0, UNKNOWN = 0,
PRIMARY, PRIMARY,

2
repmgr-action-standby.c
View File

@@ -422,7 +422,7 @@ do_standby_clone(void)
if (record_status == RECORD_FOUND) if (record_status == RECORD_FOUND)
{ {
log_hint(_("after starting the server, you need to re-register this standby with \"repmgr standby register --force\" to overwrite the existing node record")); log_hint(_("after starting the server, you need to re-register this standby with \"repmgr standby register --force\" to update the existing node record"));
} }
else else
{ {

14
repmgr.h
View File

@@ -28,16 +28,21 @@
#define MIN_SUPPORTED_VERSION "9.5" #define MIN_SUPPORTED_VERSION "9.5"
#define MIN_SUPPORTED_VERSION_NUM 90500 #define MIN_SUPPORTED_VERSION_NUM 90500
#define REPLICATION_TYPE_PHYSICAL 1
#define REPLICATION_TYPE_BDR 2
#define UNKNOWN_SERVER_VERSION_NUM -1 #define UNKNOWN_SERVER_VERSION_NUM -1
#define NODE_NOT_FOUND -1 #define NODE_NOT_FOUND -1
#define NO_UPSTREAM_NODE -1 #define NO_UPSTREAM_NODE -1
#define UNKNOWN_NODE_ID -1 #define UNKNOWN_NODE_ID -1
#define REPLICATION_TYPE_PHYSICAL 1
#define REPLICATION_TYPE_BDR 2
/*
* various default values - ensure repmgr.conf.sample is update
* if any of these are changed
*/
#define DEFAULT_LOCATION "default" #define DEFAULT_LOCATION "default"
#define DEFAULT_PRIORITY 100 #define DEFAULT_PRIORITY 100
#define DEFAULT_RECONNECTION_ATTEMPTS 6 /* seconds */ #define DEFAULT_RECONNECTION_ATTEMPTS 6 /* seconds */
@@ -52,8 +57,6 @@
#define DEFAULT_REPLICATION_LAG_WARNING 300 /* seconds */ #define DEFAULT_REPLICATION_LAG_WARNING 300 /* seconds */
#define DEFAULT_REPLICATION_LAG_CRITICAL 600 /* seconds */ #define DEFAULT_REPLICATION_LAG_CRITICAL 600 /* seconds */
#define FAILOVER_NODES_MAX_CHECK 50
#ifndef RECOVERY_COMMAND_FILE #ifndef RECOVERY_COMMAND_FILE
#define RECOVERY_COMMAND_FILE "recovery.conf" #define RECOVERY_COMMAND_FILE "recovery.conf"
@@ -63,7 +66,6 @@
#define TABLESPACE_MAP "tablespace_map" #define TABLESPACE_MAP "tablespace_map"
#endif #endif
#define ERRBUFF_SIZE 512