some cleanups around

Author: kelvich

Dockerfile

@@ -1,12 +1,9 @@
 FROM kelvich/postgres_cluster
-# RUN sysctl -w kernel.core_pattern=core
-RUN cd /pg/src/contrib/raftable && make clean && make install
 
 RUN mkdir /pg/mmts
 COPY ./ /pg/mmts/
 
-RUN export RAFTABLE_PATH=/pg/src/contrib/raftable && \
-    export USE_PGXS=1 && \
+RUN export USE_PGXS=1 && \
     cd /pg/mmts && make clean && make install
 
 # pg_regress client assumes such dir exists on server

Makefile

@@ -1,12 +1,6 @@
 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 pglogical_relid_map.o ddd.o bkb.o spill.o
 
-ifndef RAFTABLE_PATH
-RAFTABLE_PATH = ../raftable
-endif
-
-override CPPFLAGS += -I$(RAFTABLE_PATH) -I$(RAFTABLE_PATH)/raft/include
-
 EXTENSION = multimaster
 DATA = multimaster--1.0.sql
 

multimaster.c

@@ -1794,7 +1794,6 @@ bool MtmRefreshClusterStatus(bool nowait)
 	int i;
 
 	if (!MtmBuildConnectivityMatrix(matrix, nowait)) { 
-		/* RAFT is not available */
 		return false;
 	}
 
@@ -4493,7 +4492,7 @@ MtmDetectGlobalDeadLockFortXid(TransactionId xid)
 				MtmUnlockNode(i + MtmMaxNodes);
 
 				if (lockGraphData == NULL) {
-					return true; /* If using Raftable is disabled */
+					return true;
 				} else { 
 					MtmGraphAdd(&graph, (GlobalTransactionId*)lockGraphData, lockGraphSize/sizeof(GlobalTransactionId));
 				}

multimaster.h

@@ -179,7 +179,6 @@ typedef struct
 {
 	char hostName[MULTIMASTER_MAX_HOST_NAME_SIZE];
 	char connStr[MULTIMASTER_MAX_CONN_STR_SIZE];
-	int raftablePort;
 	int arbiterPort;
 } MtmConnectionInfo;
 
@@ -304,7 +303,6 @@ extern char* MtmDatabaseName;
 extern char* MtmDatabaseUser;
 extern int   MtmConnectTimeout;
 extern int   MtmReconnectTimeout;
-extern int   MtmRaftPollDelay;
 extern int   MtmNodeDisableDelay;
 extern int   MtmTransSpillThreshold;
 extern int   MtmHeartbeatSendTimeout;

raftable_wrapper.h

@@ -55,7 +55,7 @@ if [ "$1" = 'postgres' ]; then
 			max_worker_processes = 30
 			max_replication_slots = 10
 			max_wal_senders = 10
-			shared_preload_libraries = 'raftable,multimaster'
+			shared_preload_libraries = 'multimaster'
 			default_transaction_isolation = 'repeatable read'
 			log_checkpoints = on
 			checkpoint_timeout = 30
@@ -64,7 +64,7 @@ if [ "$1" = 'postgres' ]; then
 
 			multimaster.workers = 4
 			multimaster.max_nodes = 3
-			multimaster.use_raftable = false
+			multimaster.volkswagen_mode = 1
 			multimaster.queue_size=52857600
 			multimaster.ignore_tables_without_pk = 1
 			multimaster.node_id = $NODE_ID