Fix restart of raftable

knizhnik · knizhnik · commit c5304865d8c3 · 2016-07-11T16:24:02.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 4
+ENV REBUILD 5
 
 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
@@ -144,6 +144,7 @@ static BackgroundWorker MtmRecevier = {
 
 void MtmArbiterInitialize(void)
 {
+	elog(LOG, "Register background workers");
 	RegisterBackgroundWorker(&MtmSender);
 	RegisterBackgroundWorker(&MtmRecevier);
 }
@@ -659,7 +660,7 @@ static void MtmTransSender(Datum arg)
 	int i;
 
 	MtmBuffer* txBuffer = (MtmBuffer*)palloc0(sizeof(MtmBuffer)*nNodes);
-
+	elog(LOG, "Start arbiter sender %d", MyProcPid);
 	InitializeTimeouts();
 
 	signal(SIGINT, SetStop);
diff --git a/contrib/mmts/tests2/docker-entrypoint.sh b/contrib/mmts/tests2/docker-entrypoint.sh
@@ -69,7 +69,7 @@ if [ "$1" = 'postgres' ]; then
 			max_prepared_transactions = 100
 			synchronous_commit = off
 			wal_level = logical
-			max_worker_processes = 15
+			max_worker_processes = 30
 			max_replication_slots = 10
 			max_wal_senders = 10
 			shared_preload_libraries = 'raftable,multimaster'
diff --git a/contrib/raftable/raftable.c b/contrib/raftable/raftable.c
@@ -52,7 +52,7 @@ static WorkerConfig wcfg;
 static char *peerstr;
 static shmem_startup_hook_type PreviousShmemStartupHook;
 
-static void *get_shared_state(void)
+StateP get_shared_state(void)
 {
 	return shared.state;
 }
@@ -543,7 +543,7 @@ static void startup_shmem(void)
 	bool found;
 
 	if (PreviousShmemStartupHook) PreviousShmemStartupHook();
-
+	elog(LOG, "Raftable initialize shared state %d", MyProcPid);
 	shared.state = state_shmem_init();
 	shared.leader = ShmemInitStruct("raftable_leader", sizeof(int), &found);
 	*shared.leader = NOBODY;
diff --git a/contrib/raftable/state.h b/contrib/raftable/state.h
@@ -41,4 +41,6 @@ bool state_next(StateP state, void *scan, char **key, char **value, size_t *len)
 void state_shmem_request(void);
 StateP state_shmem_init(void);
 
+StateP get_shared_state(void);
+
 #endif
diff --git a/contrib/raftable/worker.c b/contrib/raftable/worker.c
@@ -441,10 +441,12 @@ static void worker_main(Datum arg)
 	sigset_t sset;
 	mstimer_t t;
 	WorkerConfig *cfg = (WorkerConfig *)(arg);
-	StateP state = (StateP)cfg->getter();
+	StateP state;
 
 	fprintf(stderr, "raftable worker_main(): stop = %d\n", stop);
 
+	state = (StateP)get_shared_state();
+
 	cfg->raft_config.userdata = state;
 	cfg->raft_config.applier = applier;
 	cfg->raft_config.snapshooter = snapshooter;
diff --git a/contrib/raftable/worker.h b/contrib/raftable/worker.h
@@ -17,7 +17,9 @@ typedef struct HostPort {
 	int port;
 } HostPort;
 
-typedef void *(*StateGetter)(void);
+struct State;
+
+typedef struct State* (*StateGetter)(void);
 
 typedef struct WorkerConfig {
 	int id;

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,7 @@ static BackgroundWorker MtmRecevier = {`
`144`	`144`
`145`	`145`	`void MtmArbiterInitialize(void)`
`146`	`146`	`{`
	`147`	`+ elog(LOG, "Register background workers");`
`147`	`148`	`RegisterBackgroundWorker(&MtmSender);`
`148`	`149`	`RegisterBackgroundWorker(&MtmRecevier);`
`149`	`150`	`}`
`@@ -659,7 +660,7 @@ static void MtmTransSender(Datum arg)`
`659`	`660`	`int i;`
`660`	`661`
`661`	`662`	`MtmBuffer* txBuffer = (MtmBuffer)palloc0(sizeof(MtmBuffer)nNodes);`
`662`		`-`
	`663`	`+ elog(LOG, "Start arbiter sender %d", MyProcPid);`
`663`	`664`	`InitializeTimeouts();`
`664`	`665`
`665`	`666`	`signal(SIGINT, SetStop);`