Check fo rinterrupts in raftable

knizhnik · knizhnik · commit 70a317ae3a23 · 2016-07-11T17:22:26.000+03:00
diff --git a/contrib/mmts/Dockerfile b/contrib/mmts/Dockerfile
@@ -31,7 +31,7 @@ USER postgres
 ENV CFLAGS -O0
 WORKDIR /pg
 
-ENV REBUILD 9
+ENV REBUILD 10
 
 RUN cd /pg && \
 	git clone https://github.com/postgrespro/postgres_cluster.git --depth 1 && \
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -710,7 +710,9 @@ static void MtmTransSender(Datum arg)
 				txBuffer[i].used = 0;
 			}
 		}		
+		CHECK_FOR_INTERRUPTS();
 	}
+	elog(LOG, "Stop arbiter sender %d", MyProcPid);
 }
 
 
diff --git a/contrib/raftable/worker.c b/contrib/raftable/worker.c
@@ -445,7 +445,7 @@ static void worker_main(Datum arg)
 
 	elog(LOG, "Start raftable worker");
 
-	state = (StateP)get_shared_state();
+	state = get_shared_state();
 
 	cfg->raft_config.userdata = state;
 	cfg->raft_config.applier = applier;
@@ -487,6 +487,7 @@ static void worker_main(Datum arg)
 			raft_handle_message(raft, m);
 			notify();
 		}
+		CHECK_FOR_INTERRUPTS();
 	}
 	elog(LOG, "Raftable worker stopped");
 }

Original file line number	Diff line number	Diff line change
`@@ -710,7 +710,9 @@ static void MtmTransSender(Datum arg)`
`710`	`710`	`txBuffer[i].used = 0;`
`711`	`711`	`}`
`712`	`712`	`}`
	`713`	`+ CHECK_FOR_INTERRUPTS();`
`713`	`714`	`}`
	`715`	`+ elog(LOG, "Stop arbiter sender %d", MyProcPid);`
`714`	`716`	`}`
`715`	`717`
`716`	`718`
Original file line number	Diff line number	Diff line change
`@@ -445,7 +445,7 @@ static void worker_main(Datum arg)`
`445`	`445`
`446`	`446`	`elog(LOG, "Start raftable worker");`
`447`	`447`
`448`		`- state = (StateP)get_shared_state();`
	`448`	`+ state = get_shared_state();`
`449`	`449`
`450`	`450`	`cfg->raft_config.userdata = state;`
`451`	`451`	`cfg->raft_config.applier = applier;`
`@@ -487,6 +487,7 @@ static void worker_main(Datum arg)`
`487`	`487`	`raft_handle_message(raft, m);`
`488`	`488`	`notify();`
`489`	`489`	`}`
	`490`	`+ CHECK_FOR_INTERRUPTS();`
`490`	`491`	`}`
`491`	`492`	`elog(LOG, "Raftable worker stopped");`
`492`	`493`	`}`