From 6f315c1b3c9216ad747f0365d93ccd5ba752ba5c Mon Sep 17 00:00:00 2001
From: Ian Barwick <ian@2ndquadrant.com>
Date: Mon, 30 Apr 2018 15:13:30 +0900
Subject: [PATCH] repmgrd: don't explicitly close connections on shutdown

---
 repmgrd-physical.c | 17 -----------------
 repmgrd-physical.h |  1 -
 repmgrd.c          | 15 ---------------
 3 files changed, 33 deletions(-)

diff --git a/repmgrd-physical.c b/repmgrd-physical.c
index 7709b614..6623423a 100644
--- a/repmgrd-physical.c
+++ b/repmgrd-physical.c
@@ -74,7 +74,6 @@ static FailoverState follow_new_primary(int new_primary_id);
 static FailoverState witness_follow_new_primary(int new_primary_id);
 
 static void reset_node_voting_status(void);
-void		close_connections_physical();
 
 static bool do_primary_failover(void);
 static bool do_upstream_standby_failover(void);
@@ -2940,19 +2939,3 @@ format_failover_state(FailoverState failover_state)
 }
 
 
-void
-close_connections_physical()
-{
-	if (PQstatus(primary_conn) == CONNECTION_OK)
-	{
-		/* cancel any pending queries to the primary */
-		if (PQisBusy(primary_conn) == 1)
-		{
-			log_debug("cancelling query on primary");
-			cancel_query(primary_conn, config_file_options.async_query_timeout);
-		}
-		close_connection(&primary_conn);
-	}
-
-	close_connection(&upstream_conn);
-}
diff --git a/repmgrd-physical.h b/repmgrd-physical.h
index 31a4ef14..d94b4976 100644
--- a/repmgrd-physical.h
+++ b/repmgrd-physical.h
@@ -24,7 +24,6 @@ void		do_physical_node_check(void);
 void		monitor_streaming_primary(void);
 void		monitor_streaming_standby(void);
 void		monitor_streaming_witness(void);
-void		close_connections_physical(void);
 
 void		handle_sigint_physical(SIGNAL_ARGS);
 
diff --git a/repmgrd.c b/repmgrd.c
index 81f18489..a3bec535 100644
--- a/repmgrd.c
+++ b/repmgrd.c
@@ -53,9 +53,6 @@ bool		startup_event_logged = false;
 MonitoringState monitoring_state = MS_NORMAL;
 instr_time	degraded_monitoring_start;
 
-static void close_connections(void);
-void		(*_close_connections) (void) = NULL;
-
 /*
  * Record receipt of SIGHUP; will cause configuration file to be reread
  * at the appropriate point in the main loop.
@@ -404,7 +401,6 @@ main(int argc, char **argv)
 	}
 	else
 	{
-		_close_connections = close_connections_physical;
 		log_debug("node id is %i, upstream node id is %i",
 				  local_node_info.node_id,
 				  local_node_info.upstream_node_id);
@@ -801,20 +797,9 @@ print_monitoring_state(MonitoringState monitoring_state)
 }
 
 
-static void
-close_connections()
-{
-	if (_close_connections != NULL)
-		_close_connections();
-
-	close_connection(&local_conn);
-}
-
-
 void
 terminate(int retval)
 {
-	close_connections();
 	logger_shutdown();
 
 	if (pid_file)