Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

Author: knizhnik

contrib/mmts/Dockerfile

@@ -0,0 +1,51 @@
+# vim:set ft=dockerfile:
+FROM debian:jessie
+
+# explicitly set user/group IDs
+RUN groupadd -r postgres --gid=999 && useradd -r -g postgres --uid=999 postgres
+
+# make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default
+RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \
+	&& localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
+ENV LANG en_US.utf8
+
+# postgres build deps
+RUN apt-get update && apt-get install -y \
+	git \
+	make \
+	gcc \
+	gdb \
+	libreadline-dev \
+	bison \
+	flex \
+	zlib1g-dev \ 
+	&& rm -rf /var/lib/apt/lists/*
+
+RUN mkdir /pg && chown postgres:postgres /pg
+USER postgres
+ENV CFLAGS -O0
+WORKDIR /pg
+
+RUN cd /pg && \
+	git clone https://github.com/postgrespro/postgres_cluster.git --depth 1 && \
+	cd /pg/postgres_cluster && \
+	./configure  --enable-cassert --enable-debug --prefix=/pg/install && \
+	make -j 4 install
+
+RUN mkdir /pg/data
+ENV PATH /pg/install/bin:$PATH
+ENV PGDATA /pg/data
+
+# Here we can insert some ENV var to invalidate subsequent layers
+
+RUN cd /pg/postgres_cluster/contrib/raftable && make install
+
+RUN mkdir /pg/mmts
+COPY ./ /pg/mmts/
+RUN cd /pg/mmts && USE_PGXS=1 RAFTABLE_PATH=/pg/postgres_cluster/contrib/raftable make install
+
+ENTRYPOINT ["/pg/mmts/tests2/docker-entrypoint.sh"]
+
+EXPOSE 5432
+CMD ["postgres"]
+

contrib/mmts/Makefile

@@ -1,7 +1,11 @@
 MODULE_big = multimaster
 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 pglogical_relid_map.o ddd.o bkb.o spill.o
 
-override CPPFLAGS += -I../raftable
+ifndef RAFTABLE_PATH
+RAFTABLE_PATH = ../raftable
+endif
+
+override CPPFLAGS += -I$(RAFTABLE_PATH)
 
 EXTRA_INSTALL = contrib/raftable contrib/mmts
 
@@ -33,3 +37,11 @@ check:
 	env DESTDIR='$(abs_top_builddir)'/tmp_install make install
 	$(prove_check)
 
+xcheck:
+	#pip install -r tests2/requirements.txt
+	docker build -t pgmmts .
+	cd tests2 && blockade up
+	sleep 10 # wait for mmts init
+	cd tests2 && python test_recovery.py || true
+	cd tests2 && blockade destroy
+

contrib/mmts/tests2/Dockerfile

@@ -27,6 +27,8 @@ Vagrant.configure(2) do |config|
     vb.memory = 2048
   end
 
+  config.vm.synced_folder "../../..", "/postgres_sources"
+
   # there are obviously vagrant versions with a
   # broken 'docker' provisioner that can be fixed
   # by invoking an 'apt-get update' *before* docker itself

contrib/mmts/tests2/Vagrantfile

@@ -332,7 +332,6 @@ bool raftable_set(const char *key, const char *value, size_t vallen, int timeout
 	size_t size = sizeof(RaftableUpdate);
 	size_t keylen = 0;
 	timeout_t timeout;
-	timeout_start(&timeout, timeout_ms);
 
 	Assert(wcfg.id >= 0);
 
@@ -352,17 +351,37 @@ bool raftable_set(const char *key, const char *value, size_t vallen, int timeout
 	memcpy(f->data, key, keylen);
 	memcpy(f->data + keylen, value, vallen);
 
-	TIMEOUT_LOOP_START(&timeout);
+	if (timeout_ms < 0)
 	{
-		if (try_sending_update(ru, size, &timeout))
+		while (true)
 		{
-			pfree(ru);
-			return true;
+			timeout_start(&timeout, 100);
+
+			if (try_sending_update(ru, size, &timeout))
+			{
+				pfree(ru);
+				return true;
+			}
+			else
+				disconnect_leader();
+		}
+	}
+	else
+	{
+		timeout_start(&timeout, timeout_ms);
+
+		TIMEOUT_LOOP_START(&timeout);
+		{
+			if (try_sending_update(ru, size, &timeout))
+			{
+				pfree(ru);
+				return true;
+			}
+			else
+				disconnect_leader();
 		}
-		else
-			disconnect_leader();
+		TIMEOUT_LOOP_END(&timeout);
 	}
-	TIMEOUT_LOOP_END(&timeout);
 
 	pfree(ru);
 	elog(WARNING, "failed to set raftable value after %d ms", timeout_elapsed_ms(&timeout));