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

kelvich · kelvich · commit ad044993c31d · 2016-04-06T19:16:34.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -1934,7 +1934,7 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)
 		elog(NOTICE, "Node %d start logical replication to node %d in normal mode", MtmNodeId, MtmReplicationNodeId); 
 	}
 	MtmUnlock();
-	on_proc_exit(MtmOnProcExit, 0);
+	on_shmem_exit(MtmOnProcExit, 0);
 }
 
 static void 
diff --git a/contrib/mmts/t/002_dtmbench.pl b/contrib/mmts/t/002_dtmbench.pl
@@ -100,7 +100,7 @@ sub allocate_ports
 {
 	push(@argv, '-c', $node->connstr('postgres'));
 }
-push(@argv, '-n', 10, '-a', 1000, '-w', 10, '-r', 1);
+push(@argv, '-n', 1000, '-a', 1000, '-w', 10, '-r', 1);
 
 diag("running dtmbench -i");
 if (TestLib::run_log([@argv, '-i']))

Original file line number	Diff line number	Diff line change
`@@ -1934,7 +1934,7 @@ MtmReplicationStartupHook(struct PGLogicalStartupHookArgs* args)`
`1934`	`1934`	`elog(NOTICE, "Node %d start logical replication to node %d in normal mode", MtmNodeId, MtmReplicationNodeId);`
`1935`	`1935`	`}`
`1936`	`1936`	`MtmUnlock();`
`1937`		`- on_proc_exit(MtmOnProcExit, 0);`
	`1937`	`+ on_shmem_exit(MtmOnProcExit, 0);`
`1938`	`1938`	`}`
`1939`	`1939`
`1940`	`1940`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ sub allocate_ports`
`100`	`100`	`{`
`101`	`101`	`push(@argv, '-c', $node->connstr('postgres'));`
`102`	`102`	`}`
`103`		`-push(@argv, '-n', 10, '-a', 1000, '-w', 10, '-r', 1);`
	`103`	`+push(@argv, '-n', 1000, '-a', 1000, '-w', 10, '-r', 1);`
`104`	`104`
`105`	`105`	`diag("running dtmbench -i");`
`106`	`106`	`if (TestLib::run_log([@argv, '-i']))`