Remove BDR 2.x support

The BDR 2.x support was conceptual only and was never used in
production. As BDR 2.x will be EOL'd shortly, there is no risk it will
be needed.

Author: ibarwick

HISTORY

@@ -1,4 +1,5 @@
 5.1     2019-??-??
+        repmgr: remove BDR 2.x support
         repmgr: don't query upstream's data directory (Ian)
         repmgr: rename --recovery-conf-only to --replication-conf-only (Ian)
         repmgr: ensure postgresql.auto.conf is created with corretc permissions (Ian)

Makefile.in

@@ -55,9 +55,9 @@ $(info Building against PostgreSQL $(MAJORVERSION))
 
 REPMGR_CLIENT_OBJS = repmgr-client.o \
 	repmgr-action-primary.o repmgr-action-standby.o repmgr-action-witness.o \
-	repmgr-action-bdr.o repmgr-action-cluster.o repmgr-action-node.o repmgr-action-service.o repmgr-action-daemon.o \
+	repmgr-action-cluster.o repmgr-action-node.o repmgr-action-service.o repmgr-action-daemon.o \
 	configfile.o configfile-scan.o log.o strutil.o controldata.o dirutil.o compat.o dbutils.o sysutils.o
-REPMGRD_OBJS = repmgrd.o repmgrd-physical.o repmgrd-bdr.o configfile.o configfile-scan.o log.o dbutils.o strutil.o controldata.o compat.o sysutils.o
+REPMGRD_OBJS = repmgrd.o repmgrd-physical.o configfile.o configfile-scan.o log.o dbutils.o strutil.o controldata.o compat.o sysutils.o
 DATE=$(shell date "+%Y-%m-%d")
 
 repmgr_version.h: repmgr_version.h.in

configfile.c

@@ -378,13 +378,6 @@ _parse_config(t_configuration_options *options, ItemList *error_list, ItemList *
 	 */
 	options->witness_sync_interval = DEFAULT_WITNESS_SYNC_INTERVAL;
 
-	/*-------------
-	 * BDR settings
-	 *-------------
-	 */
-	options->bdr_local_monitoring_only = false;
-	options->bdr_recovery_timeout = DEFAULT_BDR_RECOVERY_TIMEOUT;
-
 	/*-------------------------
 	 * service command settings
 	 *-------------------------
@@ -616,10 +609,8 @@ parse_configuration_item(t_configuration_options *options, ItemList *error_list,
 	{
 		if (strcmp(value, "physical") == 0)
 			options->replication_type = REPLICATION_TYPE_PHYSICAL;
-		else if (strcmp(value, "bdr") == 0)
-			options->replication_type = REPLICATION_TYPE_BDR;
 		else
-			item_list_append(error_list, _("value for \"replication_type\" must be \"physical\" or \"bdr\""));
+			item_list_append(error_list, _("value for \"replication_type\" must be \"physical\""));
 	}
 
 	/* log settings */
@@ -778,12 +769,6 @@ parse_configuration_item(t_configuration_options *options, ItemList *error_list,
 	else if (strcmp(name, "witness_sync_interval") == 0)
 		options->witness_sync_interval = repmgr_atoi(value, name, error_list, 1);
 
-	/* BDR settings */
-	else if (strcmp(name, "bdr_local_monitoring_only") == 0)
-		options->bdr_local_monitoring_only = parse_bool(value, name, error_list);
-	else if (strcmp(name, "bdr_recovery_timeout") == 0)
-		options->bdr_recovery_timeout = repmgr_atoi(value, name, error_list, 0);
-
 	/* service settings */
 	else if (strcmp(name, "pg_ctl_options") == 0)
 		strncpy(options->pg_ctl_options, value, sizeof(options->pg_ctl_options));
@@ -1112,8 +1097,6 @@ parse_time_unit_parameter(const char *name, const char *value, char *dest, ItemL
  * with these):
  *
  * - async_query_timeout
- * - bdr_local_monitoring_only
- * - bdr_recovery_timeout
  * - child_nodes_check_interval
  * - child_nodes_connected_min_count
  * - child_nodes_connected_include_witness
@@ -1250,24 +1233,6 @@ reload_config(t_configuration_options *orig_options, t_server_type server_type)
 		config_changed = true;
 	}
 
-	/* bdr_local_monitoring_only */
-	if (orig_options->bdr_local_monitoring_only != new_options.bdr_local_monitoring_only)
-	{
-		orig_options->bdr_local_monitoring_only = new_options.bdr_local_monitoring_only;
-		log_info(_("\"bdr_local_monitoring_only\" is now \"%s\""), new_options.bdr_local_monitoring_only == true ? "TRUE" : "FALSE");
-
-		config_changed = true;
-	}
-
-	/* bdr_recovery_timeout */
-	if (orig_options->bdr_recovery_timeout != new_options.bdr_recovery_timeout)
-	{
-		orig_options->bdr_recovery_timeout = new_options.bdr_recovery_timeout;
-		log_info(_("\"bdr_recovery_timeout\" is now \"%i\""), new_options.bdr_recovery_timeout);
-
-		config_changed = true;
-	}
-
 	/* child_nodes_check_interval */
 	if (orig_options->child_nodes_check_interval != new_options.child_nodes_check_interval)
 	{

configfile.h

@@ -161,10 +161,6 @@ typedef struct
 	int			child_nodes_disconnect_timeout;
 	char		child_nodes_disconnect_command[MAXPGPATH];
 
-	/* BDR settings */
-	bool		bdr_local_monitoring_only;
-	bool		bdr_recovery_timeout;
-
 	/* service settings */
 	char		pg_ctl_options[MAXLEN];
 	char		service_start_command[MAXPGPATH];
@@ -238,8 +234,6 @@ typedef struct
 		DEFAULT_CHILD_NODES_CONNECTED_MIN_COUNT, \
 		DEFAULT_CHILD_NODES_CONNECTED_INCLUDE_WITNESS, \
 		DEFAULT_CHILD_NODES_DISCONNECT_TIMEOUT, "", \
-		/* BDR settings */ \
-		false, DEFAULT_BDR_RECOVERY_TIMEOUT, \
 		/* service settings */ \
 		"", "", "", "", "", "", \
 		/* repmgrd service settings */ \