Add stop-signal handling to arbiter.

kvap · kvap · commit 71cf25023be9 · 2016-04-01T16:31:38.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -164,6 +164,12 @@ MtmResolveHostByName(const char *hostname, unsigned* addrs, unsigned* n_addrs)
     return 1;
 }
 
+static int stop = 0;
+static void SetStop(int sig)
+{
+	stop = 1;
+}
+
 #if USE_EPOLL
 static int    epollfd;
 #else
@@ -530,17 +536,24 @@ static void MtmBroadcastMessage(MtmBuffer* txBuffer, MtmTransState* ts)
 
 static void MtmTransSender(Datum arg)
 {
+	sigset_t sset;
 	int nNodes = MtmNodes;
 	int i;
 	MtmBuffer* txBuffer = (MtmBuffer*)palloc(sizeof(MtmBuffer)*nNodes);
-	
+
+	signal(SIGINT, SetStop);
+	signal(SIGQUIT, SetStop);
+	signal(SIGTERM, SetStop);
+	sigfillset(&sset);
+	sigprocmask(SIG_UNBLOCK, &sset, NULL);
+
 	MtmOpenConnections();
 
 	for (i = 0; i < nNodes; i++) { 
 		txBuffer[i].used = 0;
 	}
 
-	while (true) {
+	while (!stop) {
 		MtmTransState* ts;		
 		PGSemaphoreLock(&Mtm->votingSemaphore);
 		CHECK_FOR_INTERRUPTS();
@@ -605,6 +618,7 @@ static bool MtmRecovery()
 
 static void MtmTransReceiver(Datum arg)
 {
+	sigset_t sset;
 	int nNodes = MtmNodes;
 	int nResponses;
 	int i, j, n, rc;
@@ -617,14 +631,20 @@ static void MtmTransReceiver(Datum arg)
     FD_ZERO(&inset);
     max_fd = 0;
 #endif
+
+	signal(SIGINT, SetStop);
+	signal(SIGQUIT, SetStop);
+	signal(SIGTERM, SetStop);
+	sigfillset(&sset);
+	sigprocmask(SIG_UNBLOCK, &sset, NULL);
 	
 	MtmAcceptIncomingConnections();
 
 	for (i = 0; i < nNodes; i++) { 
 		rxBuffer[i].used = 0;
 	}
 
-	while (true) {
+	while (!stop) {
 #if USE_EPOLL
         n = epoll_wait(epollfd, events, nNodes, MtmKeepaliveTimeout/1000);
 		if (n < 0) { 
diff --git a/contrib/mmts/t/000_deadlock.pl b/contrib/mmts/t/000_deadlock.pl
@@ -56,7 +56,7 @@ sub allocate_ports
 	return @allocated_now;
 }
 
-my $nnodes = 3;
+my $nnodes = 2;
 my @nodes = ();
 
 # Create nodes and allocate ports
diff --git a/contrib/mmts/t/001_basic_recovery.pl b/contrib/mmts/t/001_basic_recovery.pl
@@ -96,18 +96,27 @@ sub PostgresNode::inet_connstr {
 
 $nodes[2]->teardown_node;
 
+diag("sleeping");
+sleep(15);
+
+diag("inserting 2");
 $nodes[0]->psql('postgres', "insert into t values(2, 20);");
+diag("selecting");
 $nodes[1]->psql('postgres', "select v from t where k=2;", stdout => \$psql_out);
+diag("selected");
 is($psql_out, '20', "Check replication after node failure.");
 
 ###############################################################################
 # Work after node start
 ###############################################################################
 
 $nodes[2]->start;
-sleep(5); # XXX: here we can poll
+sleep(15); # XXX: here we can poll
+diag("inserting 3");
 $nodes[0]->psql('postgres', "insert into t values(3, 30);");
+diag("selecting");
 $nodes[2]->psql('postgres', "select v from t where k=3;", stdout => \$psql_out);
+diag("selected");
 is($psql_out, '30', "Check replication after failed node recovery.");
 
 

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ sub allocate_ports`
`56`	`56`	`return @allocated_now;`
`57`	`57`	`}`
`58`	`58`
`59`		`-my $nnodes = 3;`
	`59`	`+my $nnodes = 2;`
`60`	`60`	`my @nodes = ();`
`61`	`61`
`62`	`62`	`# Create nodes and allocate ports`