Add a lock graph dumping function to multimaster sql api.

kvap · kvap · commit df68923fffe9 · 2016-04-07T18:58:38.000+03:00
diff --git a/contrib/mmts/multimaster--1.0.sql b/contrib/mmts/multimaster--1.0.sql
@@ -40,6 +40,10 @@ CREATE FUNCTION mtm.make_table_local(relation regclass) RETURNS void
 AS 'MODULE_PATHNAME','mtm_make_table_local'
 LANGUAGE C;
 
+CREATE FUNCTION mtm.dump_lock_graph() RETURNS text
+AS 'MODULE_PATHNAME','mtm_dump_lock_graph'
+LANGUAGE C;
+
 CREATE TABLE IF NOT EXISTS mtm.ddl_log (issued timestamp with time zone not null, query text);
 
 CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema text, rel_name text, primary key(rel_schema, rel_name));
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -108,6 +108,7 @@ PG_FUNCTION_INFO_V1(mtm_get_snapshot);
 PG_FUNCTION_INFO_V1(mtm_get_nodes_state);
 PG_FUNCTION_INFO_V1(mtm_get_cluster_state);
 PG_FUNCTION_INFO_V1(mtm_make_table_local);
+PG_FUNCTION_INFO_V1(mtm_dump_lock_graph);
 
 static Snapshot MtmGetSnapshot(Snapshot snapshot);
 static void MtmInitialize(void);
@@ -2154,6 +2155,31 @@ Datum mtm_make_table_local(PG_FUNCTION_ARGS)
 	return false;
 }
 
+Datum mtm_dump_lock_graph(PG_FUNCTION_ARGS)
+{
+	StringInfo s = makeStringInfo();
+	int i;
+	for (i = 0; i < MtmNodes; i++)
+	{
+		size_t size;
+		char *data = RaftableGet(psprintf("lock-graph-%d", i+1), &size, NULL, true);
+		if (!data) continue;
+		GlobalTransactionId *gtid = (GlobalTransactionId *)data;
+		GlobalTransactionId *last = (GlobalTransactionId *)(data + size);
+		appendStringInfo(s, "node-%d lock graph: ", i+1);
+		while (gtid != last) { 
+			GlobalTransactionId *src = gtid++;
+			appendStringInfo(s, "%d:%d -> ", src->node, src->xid);
+			while (gtid->node != 0) {
+				GlobalTransactionId *dst = gtid++;
+				appendStringInfo(s, "%d:%d, ", dst->node, dst->xid);
+			}
+			gtid += 1;
+		}
+		appendStringInfo(s, "\n");
+	}
+	return CStringGetTextDatum(s->data);
+}
 
 /*
  * -------------------------------------------
diff --git a/contrib/mmts/t/002_dtmbench.pl b/contrib/mmts/t/002_dtmbench.pl
@@ -60,7 +60,7 @@ sub allocate_ports
 		listen_addresses = '$host'
 		unix_socket_directories = ''
 		port = $pgport
-		max_prepared_transactions = 10
+		max_prepared_transactions = 1000
 		max_worker_processes = 10
 		wal_level = logical
 		fsync = off	
@@ -103,13 +103,13 @@ sub allocate_ports
 push(@argv, '-n', 1000, '-a', 1000, '-w', 10, '-r', 1);
 
 diag("running dtmbench -i");
-if (TestLib::run_log([@argv, '-i']))
+if (!TestLib::run_log([@argv, '-i']))
 {
 	BAIL_OUT("dtmbench -i failed");
 }
 
 diag("running dtmbench");
-if (TestLib::run_log(\@argv, '>', \$out))
+if (!TestLib::run_log(\@argv, '>', \$out))
 {
 	fail("dtmbench failed");
 }
diff --git a/contrib/mmts/t/003_pgbench.pl b/contrib/mmts/t/003_pgbench.pl
@@ -62,7 +62,7 @@ sub allocate_ports
 		listen_addresses = '$host'
 		unix_socket_directories = ''
 		port = $pgport
-		max_prepared_transactions = 10
+		max_prepared_transactions = 1000
 		max_worker_processes = 10
 		wal_level = logical
 		fsync = off	

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ sub allocate_ports`
`60`	`60`	`listen_addresses = '$host'`
`61`	`61`	`unix_socket_directories = ''`
`62`	`62`	`port = $pgport`
`63`		`- max_prepared_transactions = 10`
	`63`	`+ max_prepared_transactions = 1000`
`64`	`64`	`max_worker_processes = 10`
`65`	`65`	`wal_level = logical`
`66`	`66`	`fsync = off`
`@@ -103,13 +103,13 @@ sub allocate_ports`
`103`	`103`	`push(@argv, '-n', 1000, '-a', 1000, '-w', 10, '-r', 1);`
`104`	`104`
`105`	`105`	`diag("running dtmbench -i");`
`106`		`-if (TestLib::run_log([@argv, '-i']))`
	`106`	`+if (!TestLib::run_log([@argv, '-i']))`
`107`	`107`	`{`
`108`	`108`	`BAIL_OUT("dtmbench -i failed");`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`diag("running dtmbench");`
`112`		`-if (TestLib::run_log(\@argv, '>', \$out))`
	`112`	`+if (!TestLib::run_log(\@argv, '>', \$out))`
`113`	`113`	`{`
`114`	`114`	`fail("dtmbench failed");`
`115`	`115`	`}`