Merge branch 'PGPROEE10_MULTIMASTER' into PGPROEE10

Author: vbwagner

Dockerfile

@@ -12,11 +12,9 @@ ENV PATH /pg/install/bin:$PATH
 
 COPY ./ /pg/src
 
-# crutch to allow regression test to write there
-RUN mkdir -p /pg/src/src/test/regress/results && \
-	chown postgres:postgres /pg/src/src/test/regress/results
-
 RUN cd /pg/src && \
 	./configure --enable-cassert --enable-debug --prefix=/pg/install && \
 	make -j 4 install
 
+# crutch to allow regression test to write there
+RUN chown -R postgres:postgres /pg/src/src/test/regress

contrib/mmts/multimaster.c

@@ -42,6 +42,7 @@
 #include "executor/executor.h"
 #include "access/twophase.h"
 #include "utils/guc.h"
+#include "utils/guc_tables.h"
 #include "utils/hsearch.h"
 #include "utils/timeout.h"
 #include "utils/tqual.h"
@@ -4913,6 +4914,34 @@ static void MtmGucSet(VariableSetStmt *stmt, const char *queryStr)
 	MemoryContextSwitchTo(oldcontext);
 }
 
+static int
+_var_name_cmp(const void *a, const void *b)
+{
+	const struct config_generic *confa = *(struct config_generic * const *) a;
+	const struct config_generic *confb = *(struct config_generic * const *) b;
+
+	return strcmp(confa->name, confb->name);
+}
+
+static struct config_generic *
+fing_guc_conf(const char *name)
+{
+	int num;
+	struct config_generic **vars;
+	const char **key = &name;
+	struct config_generic **res;
+
+	num = GetNumConfigOptions();
+	vars = get_guc_variables();
+
+	res = (struct config_generic **) bsearch((void *) &key,
+										(void *) vars,
+										num, sizeof(struct config_generic *),
+										_var_name_cmp);
+
+	return res ? *res : NULL;
+}
+
 char* MtmGucSerialize(void)
 {
 	StringInfo serialized_gucs;
@@ -4927,6 +4956,7 @@ char* MtmGucSerialize(void)
 	dlist_foreach(iter, &MtmGucList)
 	{
 		MtmGucEntry *cur_entry = dlist_container(MtmGucEntry, list_node, iter.cur);
+		struct config_generic *gconf;
 
 		if (strcmp(cur_entry->key, "search_path") == 0)
 			continue;
@@ -4935,8 +4965,8 @@ char* MtmGucSerialize(void)
 		appendStringInfoString(serialized_gucs, cur_entry->key);
 		appendStringInfoString(serialized_gucs, " TO ");
 
-		/* quite a crutch */
-		if (strstr(cur_entry->key, "_mem") != NULL || *(cur_entry->value) == '\0')
+		gconf = fing_guc_conf(cur_entry->key);
+		if (gconf && (gconf->vartype == PGC_STRING || gconf->flags & (GUC_UNIT_MEMORY | GUC_UNIT_TIME)))
 		{
 			appendStringInfoString(serialized_gucs, "'");
 			appendStringInfoString(serialized_gucs, cur_entry->value);

contrib/mmts/pglogical_proto.c

@@ -485,7 +485,7 @@ pglogical_write_prepare(StringInfo out, PGLogicalOutputData *data,
 	uint8 event = *txn->state_3pc ? PGLOGICAL_PRECOMMIT_PREPARED : PGLOGICAL_PREPARE;
 
 	/* COMMIT and PREPARE are preceded by BEGIN, which set MtmIsFilteredTxn flag */
-	if (MtmIsFilteredTxn)
+	if (MtmIsFilteredTxn && event == PGLOGICAL_PREPARE)
 		return;
 
 	/* send the event fields */

contrib/mmts/tests/reinit-mm.sh

@@ -77,9 +77,14 @@ do
         multimaster.arbiter_port = $arbiter_port
         multimaster.max_recovery_lag = 30GB
         multimaster.referee_connstring = 'dbname=$USER host=127.0.0.1 port=5440 sslmode=disable'
-	#multimaster.preserve_commit_order=false
 SQL
-    cp pg_hba.conf tmp_check/node$i
+
+    cat <<CONF >> tmp_check/node$i/pg_hba.conf
+        host all all 0.0.0.0/0 trust
+        host replication all 0.0.0.0/0 trust
+CONF
+
+    # cp pg_hba.conf tmp_check/node$i
     pg_ctl -w -D tmp_check/node$i -l node$i.log start
 done
 

contrib/mmts/tests2/docker-entrypoint.sh

@@ -68,6 +68,10 @@ if [ "$1" = 'postgres' ]; then
 			multimaster.max_recovery_lag = 1GB
 			multimaster.min_recovery_lag = 10kB
 			multimaster.preserve_commit_order = on
+
+			multimaster.volkswagen_mode = on
+			multimaster.ignore_tables_without_pk = on
+			partition_backend = 'internal'
 		EOF
 
 		if [ -n "$NODE_ID" ]; then

src/backend/replication/logical/decode.c

@@ -673,6 +673,9 @@ DecodePrepare(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 		ReorderBufferXidSetCatalogChanges(ctx->reorder, xid, buf->origptr);
 	}
 
+	SnapBuildCommitTxn(ctx->snapshot_builder, buf->origptr, xid,
+					   parsed->nsubxacts, parsed->subxacts);
+
 	if (SnapBuildXactNeedsSkip(ctx->snapshot_builder, buf->origptr) ||
 		(parsed->dbId != InvalidOid && parsed->dbId != ctx->slot->data.database) ||
 		FilterByOrigin(ctx, origin_id))