reload config on sighup in bgworkers

kelvich · kelvich · commit 5c839157ab0e · 2017-11-13T02:21:38.000+03:00
diff --git a/arbiter.c b/arbiter.c
@@ -715,6 +715,7 @@ static void MtmSender(Datum arg)
 	pqsignal(SIGINT, SetStop);
 	pqsignal(SIGQUIT, SetStop);
 	pqsignal(SIGTERM, SetStop);
+	pqsignal(SIGHUP, PostgresSigHupHandler);
 
 	/* We're now ready to receive signals */
 	BackgroundWorkerUnblockSignals();
@@ -733,6 +734,12 @@ static void MtmSender(Datum arg)
 		PGSemaphoreLock(&Mtm->sendSemaphore);
 		CHECK_FOR_INTERRUPTS();
 
+		if (ConfigReloadPending)
+		{
+			ConfigReloadPending = false;
+			ProcessConfigFile(PGC_SIGHUP);
+		}
+
 		MtmCheckHeartbeat();
 		/* 
 		 * Use shared lock to improve locality,
@@ -794,6 +801,7 @@ static void MtmMonitor(Datum arg)
 	pqsignal(SIGINT, SetStop);
 	pqsignal(SIGQUIT, SetStop);
 	pqsignal(SIGTERM, SetStop);
+	pqsignal(SIGHUP, PostgresSigHupHandler);
 	
 	MtmBackgroundWorker = true;
 
@@ -808,6 +816,13 @@ static void MtmMonitor(Datum arg)
 		if (rc & WL_POSTMASTER_DEATH) { 
 			break;
 		}
+
+		if (ConfigReloadPending)
+		{
+			ConfigReloadPending = false;
+			ProcessConfigFile(PGC_SIGHUP);
+		}
+
 		MtmRefreshClusterStatus();
 	}
 }
@@ -833,6 +848,7 @@ static void MtmReceiver(Datum arg)
 	pqsignal(SIGINT, SetStop);
 	pqsignal(SIGQUIT, SetStop);
 	pqsignal(SIGTERM, SetStop);
+	pqsignal(SIGHUP, PostgresSigHupHandler);
 
 	MtmBackgroundWorker = true;
 
@@ -868,7 +884,14 @@ static void MtmReceiver(Datum arg)
 		for (j = 0; j < n; j++) {
 			if (events[j].events & EPOLLIN)  
 #else
-        fd_set events;
+		fd_set events;
+
+		if (ConfigReloadPending)
+		{
+			ConfigReloadPending = false;
+			ProcessConfigFile(PGC_SIGHUP);
+		}
+
 		do { 
 			struct timeval tv;
 			events = inset;
diff --git a/bgwpool.c b/bgwpool.c
@@ -14,6 +14,7 @@
 
 #include "bgwpool.h"
 #include "multimaster.h"
+#include "utils/guc.h"
 
 bool MtmIsLogicalReceiver;
 int  MtmMaxWorkers;
@@ -43,14 +44,21 @@ static void BgwPoolMainLoop(BgwPool* pool)
 	pqsignal(SIGINT, BgwShutdownWorker);
 	pqsignal(SIGQUIT, BgwShutdownWorker);
 	pqsignal(SIGTERM, BgwShutdownWorker);
+	pqsignal(SIGHUP, PostgresSigHupHandler);
 
     BackgroundWorkerUnblockSignals();
 	BackgroundWorkerInitializeConnection(pool->dbname, pool->dbuser);
 	ActivePortal = &fakePortal;
 	ActivePortal->status = PORTAL_ACTIVE;
 	ActivePortal->sourceText = "";
 
-    while (true) { 
+	while (true) {
+		if (ConfigReloadPending)
+		{
+			ConfigReloadPending = false;
+			ProcessConfigFile(PGC_SIGHUP);
+		}
+
         PGSemaphoreLock(&pool->available);
         SpinLockAcquire(&pool->lock);
 		if (pool->shutdown) { 	
diff --git a/tests2/support/two_nodes.yml b/tests2/support/two_nodes.yml
@@ -12,7 +12,7 @@ services:
       POSTGRES_USER: 'pg'
       POSTGRES_DB: 'regression'
       NODE_ID: 1
-      MAJOR: 'on'
+      MAJOR: 'off'
       CONNSTRS: >-
         dbname=regression user=pg host=node1,
         dbname=regression user=pg host=node2
diff --git a/tests2/test_major.py b/tests2/test_major.py
@@ -72,10 +72,10 @@ def tearDown(self):
     def test_partition_major(self):
         print('### test_partition_major ###')
 
-        # MajorTest.client.execute(0, [
-        #     'alter system set multimaster.major_node to true',
-        #     'select pg_reload_conf();'
-        # ])
+        MajorTest.client.execute(0, [
+            'alter system set multimaster.major_node to true',
+            'select pg_reload_conf()'
+        ])
 
         aggs_failure, aggs = self.performFailure(SingleNodePartition('node2'))
 
