Merge branch 'master' into more_tests

kelvich · kelvich · commit e9f38f8df9d8 · 2016-10-28T01:23:08.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -101,7 +101,7 @@ typedef enum
 #define MTM_MAP_SIZE   MTM_HASH_SIZE
 #define MIN_WAIT_TIMEOUT 1000
 #define MAX_WAIT_TIMEOUT 100000
-#define MAX_WAIT_LOOPS   100 // 1000000 
+#define MAX_WAIT_LOOPS   10000 // 1000000 
 #define STATUS_POLL_DELAY USECS_PER_SEC
 
 void _PG_init(void);
@@ -2915,6 +2915,7 @@ void MtmDropNode(int nodeId, bool dropSlot)
 
 	MtmUnlock();
 }
+
 static void
 MtmOnProcExit(int code, Datum arg)
 {
@@ -3078,9 +3079,7 @@ void MtmSetupReplicationHooks(struct PGLogicalHooks* hooks)
 
 void MtmBeginSession(int nodeId)
 {
-	char slot_name[MULTIMASTER_MAX_SLOT_NAME_SIZE];
 	MtmLockNode(nodeId, LW_EXCLUSIVE);
-	sprintf(slot_name, MULTIMASTER_SLOT_PATTERN, nodeId);
 	Assert(replorigin_session_origin == InvalidRepOriginId);
 	replorigin_session_origin = Mtm->nodes[nodeId-1].originId;
 	Assert(replorigin_session_origin != InvalidRepOriginId);
diff --git a/contrib/mmts/pglogical_apply.c b/contrib/mmts/pglogical_apply.c
@@ -602,7 +602,14 @@ process_remote_commit(StringInfo in)
 
 	origin_node = pq_getmsgbyte(in);
 	origin_lsn = pq_getmsgint64(in);
-	Mtm->nodes[origin_node-1].restartLsn = origin_lsn;
+
+	if (Mtm->nodes[origin_node-1].restartLsn < origin_lsn) { 
+		Mtm->nodes[origin_node-1].restartLsn = origin_lsn;
+	}
+	if (origin_node != MtmReplicationNodeId) {
+		replorigin_advance(Mtm->nodes[origin_node-1].originId, origin_lsn, GetXLogInsertRecPtr(),
+						   false /* backward */ , false /* WAL */ );
+	}
 
 	Assert(replorigin_session_origin == InvalidRepOriginId);
 
diff --git a/contrib/mmts/tests/run.sh b/contrib/mmts/tests/run.sh
@@ -1,5 +1,5 @@
 ./dtmbench  \
--c "dbname=postgres host=localhost port=5432 sslmode=disable" \
--c "dbname=postgres host=localhost port=5433 sslmode=disable" \
--c "dbname=postgres host=localhost port=5434 sslmode=disable" \
+-c "dbname=regression host=localhost port=5432 sslmode=disable" \
+-c "dbname=regression host=localhost port=5433 sslmode=disable" \
+-c "dbname=regression host=localhost port=5434 sslmode=disable" \
 -n 1000 -a 1000 -w 10 -r 1 $*
