Add MtmUseRaftable config parameter

knizhnik · knizhnik · commit a85c6ec2d7b0 · 2016-03-30T10:52:31.000+03:00
diff --git a/contrib/mmts/Makefile b/contrib/mmts/Makefile
@@ -1,12 +1,12 @@
 MODULE_big = multimaster
-OBJS = multimaster.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o ddd.o bkb.o
+OBJS = multimaster.o raftable.o arbiter.o bytebuf.o bgwpool.o pglogical_output.o pglogical_proto.o pglogical_receiver.o pglogical_apply.o pglogical_hooks.o pglogical_config.o ddd.o bkb.o
 
 EXTENSION = multimaster
 DATA = multimaster--1.0.sql
 
 .PHONY: all
 
-all: multimaster.o multimaster.so
+all: multimaster.so
 
 PG_CPPFLAGS = -I$(libpq_srcdir) -DUSE_PGLOGICAL_OUTPUT
 SHLIB_LINK = $(libpq)
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -171,6 +171,7 @@ int   MtmConnectAttempts;
 int   MtmConnectTimeout;
 int   MtmKeepaliveTimeout;
 int   MtmReconnectAttempts;
+bool  MtmUseRaftable;
 MtmConnectionInfo* MtmConnections;
 
 static char* MtmConnStrs;
@@ -179,7 +180,6 @@ static int MtmWorkers;
 static int MtmVacuumDelay;
 static int MtmMinRecoveryLag;
 static int MtmMaxRecoveryLag;
-static bool MtmUseRaftable;
 
 static ExecutorFinish_hook_type PreviousExecutorFinishHook;
 static ProcessUtility_hook_type PreviousProcessUtilityHook;
diff --git a/contrib/mmts/raftable.h b/contrib/mmts/raftable.h
@@ -33,5 +33,6 @@ extern bool  RaftableCAS(char const* key, char const* value, bool nowait);
 typedef void* (*raftable_get_t)(char const* key, int* size, int timeout);
 typedef void (*raftable_set_t)(char const* key, void const* value, int size, int timeout);
 
+extern bool MtmUseRaftable;
 
 #endif
