postgrespro
diff --git a/‎Dockerfile
Lines changed: 2 additions & 2 deletions b/‎Dockerfile
Lines changed: 2 additions & 2 deletions
diff --git a/‎contrib/mmts/Dockerfile
Lines changed: 6 additions & 7 deletions b/‎contrib/mmts/Dockerfile
Lines changed: 6 additions & 7 deletions
diff --git a/‎contrib/mmts/tests2/Vagrantfile
Lines changed: 0 additions & 44 deletions b/‎contrib/mmts/tests2/Vagrantfile
Lines changed: 0 additions & 44 deletions
diff --git a/‎contrib/mmts/tests2/blockade.yml
Lines changed: 0 additions & 34 deletions b/‎contrib/mmts/tests2/blockade.yml
Lines changed: 0 additions & 34 deletions
diff --git a/‎contrib/mmts/tests2/client2.py
Lines changed: 0 additions & 243 deletions b/‎contrib/mmts/tests2/client2.py
Lines changed: 0 additions & 243 deletions
diff --git a/‎contrib/mmts/tests2/docker-entrypoint.sh
Lines changed: 5 additions & 4 deletions b/‎contrib/mmts/tests2/docker-entrypoint.sh
Lines changed: 5 additions & 4 deletions
diff --git a/‎contrib/mmts/tests2/lib/__init__.py b/‎contrib/mmts/tests2/lib/__init__.py
@@ -1,8 +1,8 @@
-FROM alpine:latest
+FROM alpine:3.4
 
 RUN apk add --update gcc libc-dev bison flex readline-dev zlib-dev perl make
 
-# there is already accidental postgres user in alpine, so call ours pg =/
+# there is already accidental postgres user in alpine
 # RUN addgroup pg && adduser -h /pg -D -G pg pg
 RUN mkdir /pg && chown postgres:postgres pg
 
 
@@ -7,16 +7,15 @@ RUN cd /pg/src/contrib/raftable && make clean && make install
 RUN mkdir /pg/mmts
 COPY ./ /pg/mmts/
 
-ENV RAFTABLE_PATH /pg/src/contrib/raftable
-ENV USE_PGXS 1
-ENV PGDATA /pg/data
-
-RUN cd /pg/mmts && make clean && make install
+RUN export RAFTABLE_PATH=/pg/src/contrib/raftable && \
+    export USE_PGXS=1 && \
+    cd /pg/mmts && make clean && make install
 
-# RUN cd /pg/src/src/test/regress && make && ./pg_regress || true
+# pg_regress client assumes such dir exists on server
+RUN mkdir /pg/src/src/test/regress/results
 
+ENV PGDATA /pg/data
 ENTRYPOINT ["/pg/mmts/tests2/docker-entrypoint.sh"]
 
 EXPOSE 5432
 CMD ["postgres"]
-
@@ -16,9 +16,9 @@ if [ "$1" = 'postgres' ]; then
 			-o "-c listen_addresses=''" \
 			-w start
 
-		# : ${POSTGRES_USER:=postgres}
-		# : ${POSTGRES_DB:=$POSTGRES_USER}
-		# export POSTGRES_USER POSTGRES_DB
+		: ${POSTGRES_USER:=postgres}
+		: ${POSTGRES_DB:=$POSTGRES_USER}
+		export POSTGRES_USER POSTGRES_DB
 
 		if [ "$POSTGRES_DB" != 'postgres' ]; then
 			psql -U `whoami` postgres <<-EOSQL
@@ -57,13 +57,14 @@ 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
 			multimaster.conn_strings = '$CONNSTRS'
 			multimaster.heartbeat_recv_timeout = 1000
 			multimaster.heartbeat_send_timeout = 250
-			multimaster.twopc_min_timeout = 2000
+			multimaster.twopc_min_timeout = 400000
 		EOF
 
 		pg_ctl -D "$PGDATA" -m fast -w stop