Handle stop signals in bgworkers

knizhnik · knizhnik · commit 3ffb09efb2f4 · 2016-11-08T15:45:21.000+03:00
diff --git a/contrib/mmts/Cluster.pm b/contrib/mmts/Cluster.pm
@@ -209,17 +209,17 @@ sub stop
 	my $nodes = $self->{nodes};
 	$mode = 'fast' unless defined $mode;
 
-	diag("Dumping logs:");
-	foreach my $node (@$nodes) {
-		diag("##################################################################");
-		diag($node->{_logfile});
-		diag("##################################################################");
-		my $filename = $node->{_logfile};
-		open my $fh, '<', $filename or die "error opening $filename: $!";
-		my $data = do { local $/; <$fh> };
-		diag($data);
-		diag("##################################################################\n\n");
-	}
+	#diag("Dumping logs:");
+	#foreach my $node (@$nodes) {
+		#diag("##################################################################");
+		#diag($node->{_logfile});
+		#diag("##################################################################");
+		#my $filename = $node->{_logfile};
+		#open my $fh, '<', $filename or die "error opening $filename: $!";
+		#my $data = do { local $/; <$fh> };
+		#diag($data);
+		#diag("##################################################################\n\n");
+	#}
 
 	my $ok = 1;
 	diag("stopping cluster ${mode}ly");
@@ -233,7 +233,7 @@ sub stop
 			}
 		}
 	}
-
+	sleep(2);
 	return $ok;
 }
 
diff --git a/contrib/mmts/bgwpool.c b/contrib/mmts/bgwpool.c
@@ -5,6 +5,7 @@
 #include "postmaster/bgworker.h"
 #include "storage/s_lock.h"
 #include "storage/spin.h"
+#include "storage/proc.h"
 #include "storage/pg_sema.h"
 #include "storage/shmem.h"
 #include "datatype/timestamp.h"
@@ -16,23 +17,41 @@
 bool MtmIsLogicalReceiver;
 int  MtmMaxWorkers;
 
+static BgwPool* pool;
+
+static void BgwShutdownWorker(int sig)
+{
+	BgwPoolStop(pool);
+}
+
 static void BgwPoolMainLoop(BgwPool* pool)
 {
     int size;
     void* work;
 	static PortalData fakePortal;
+	sigset_t sset;
 
 	MtmIsLogicalReceiver = true;
 
+	signal(SIGINT, BgwShutdownWorker);
+	signal(SIGQUIT, BgwShutdownWorker);
+	signal(SIGTERM, BgwShutdownWorker);
+
+	sigfillset(&sset);
+	sigprocmask(SIG_UNBLOCK, &sset, NULL);
+
     BackgroundWorkerUnblockSignals();
 	BackgroundWorkerInitializeConnection(pool->dbname, pool->dbuser);
 	ActivePortal = &fakePortal;
 	ActivePortal->status = PORTAL_ACTIVE;
 	ActivePortal->sourceText = "";
 
-    while(true) { 
+    while (true) { 
         PGSemaphoreLock(&pool->available);
         SpinLockAcquire(&pool->lock);
+		if (pool->shutdown) { 
+			break;
+		}
         size = *(int*)&pool->queue[pool->head];
         Assert(size < pool->size);
         work = malloc(size);
@@ -64,6 +83,7 @@ static void BgwPoolMainLoop(BgwPool* pool)
 		pool->lastPeakTime = 0;
         SpinLockRelease(&pool->lock);
     }
+	SpinLockRelease(&pool->lock);
 }
 
 void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, char const* dbname,  char const* dbuser, size_t queueSize, size_t nWorkers)
@@ -75,6 +95,7 @@ void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, char const* dbname,  c
     PGSemaphoreReset(&pool->available);
     PGSemaphoreReset(&pool->overflow);
     SpinLockInit(&pool->lock);
+	pool->shutdown = false;
     pool->producerBlocked = false;
     pool->head = 0;
     pool->tail = 0;
@@ -167,7 +188,7 @@ void BgwPoolExecute(BgwPool* pool, void* work, size_t size)
 	}
  
     SpinLockAcquire(&pool->lock);
-    while (true) { 
+    while (!pool->shutdown) { 
         if ((pool->head <= pool->tail && pool->size - pool->tail < size + 4 && pool->head < size) 
             || (pool->head > pool->tail && pool->head - pool->tail < size + 4))
         {
@@ -204,3 +225,11 @@ void BgwPoolExecute(BgwPool* pool, void* work, size_t size)
     SpinLockRelease(&pool->lock);            
 }
 
+void BgwPoolStop(BgwPool* pool)
+{
+    SpinLockAcquire(&pool->lock);
+	pool->shutdown = true;
+    SpinLockRelease(&pool->lock);            
+	PGSemaphoreUnlock(&pool->available);
+	PGSemaphoreUnlock(&pool->overflow);
+}
diff --git a/contrib/mmts/bgwpool.h b/contrib/mmts/bgwpool.h
@@ -34,6 +34,7 @@ typedef struct
 	time_t lastPeakTime;
 	timestamp_t lastDynamicWorkerStartTime;
     bool   producerBlocked;
+	bool   shutdown;
     char   dbname[MAX_DBNAME_LEN];
 	char   dbuser[MAX_DBUSER_LEN];
     char*  queue;
@@ -51,4 +52,5 @@ extern size_t BgwPoolGetQueueSize(BgwPool* pool);
 
 extern timestamp_t BgwGetLastPeekTime(BgwPool* pool);
 
+extern void BgwPoolStop(BgwPool* pool);
 #endif
