add mtm.poll_node function

knizhnik · knizhnik · commit 6fae8cd967d1 · 2016-04-12T19:53:23.000+03:00
diff --git a/contrib/mmts/check-recovery.sh b/contrib/mmts/check-recovery.sh
@@ -1,2 +1,2 @@
-rm -rf /home/knizhnik/postgres_cluster/contrib/mmts/tmp_check/log
+rm -rf /home/knizhnik/postgres_cluster/contrib/mmts/tmp_check
 TESTDIR='/home/knizhnik/postgres_cluster/contrib/mmts' PATH="/home/knizhnik/postgres_cluster/tmp_install/home/knizhnik/postgres_cluster/dist/bin:$PATH" LD_LIBRARY_PATH="/home/knizhnik/postgres_cluster/tmp_install/home/knizhnik/postgres_cluster/dist/lib:$LD_LIBRARY_PATH" PGPORT='65432' PG_REGRESS='/home/knizhnik/postgres_cluster/contrib/mmts/../../src/test/regress/pg_regress' prove -I ../../src/test/perl/ --verbose t/001_basic_recovery.pl
diff --git a/contrib/mmts/multimaster--1.0.sql b/contrib/mmts/multimaster--1.0.sql
@@ -44,6 +44,10 @@ CREATE FUNCTION mtm.dump_lock_graph() RETURNS text
 AS 'MODULE_PATHNAME','mtm_dump_lock_graph'
 LANGUAGE C;
 
+CREATE FUNCTION mtm.poll_node(nodeId integer, noWait boolean default FALSE) RETURNS boolean
+AS 'MODULE_PATHNAME','mtm_poll_node'
+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
@@ -103,6 +103,7 @@ PG_MODULE_MAGIC;
 PG_FUNCTION_INFO_V1(mtm_start_replication);
 PG_FUNCTION_INFO_V1(mtm_stop_replication);
 PG_FUNCTION_INFO_V1(mtm_drop_node);
+PG_FUNCTION_INFO_V1(mtm_poll_node);
 PG_FUNCTION_INFO_V1(mtm_recover_node);
 PG_FUNCTION_INFO_V1(mtm_get_snapshot);
 PG_FUNCTION_INFO_V1(mtm_get_nodes_state);
@@ -2069,6 +2070,27 @@ mtm_drop_node(PG_FUNCTION_ARGS)
     PG_RETURN_VOID();
 }
 	
+Datum
+mtm_poll_node(PG_FUNCTION_ARGS)
+{
+	int nodeId = PG_GETARG_INT32(0);
+	bool nowait = PG_GETARG_BOOL(1);
+	bool online = true;
+	while (BIT_CHECK(Mtm->disabledNodeMask, nodeId-1)) { 
+		if (nowait) { 
+			online = false;
+			break;
+		} else { 
+			MtmSleep(STATUS_POLL_DELAY);
+		}
+	}
+	if (!nowait) { 
+		/* Just wait some time until logical repication channels will be reestablished */
+		MtmSleep(MtmNodeDisableDelay);
+	}
+    PG_RETURN_BOOL(online);
+}
+	
 Datum
 mtm_recover_node(PG_FUNCTION_ARGS)
 {
diff --git a/contrib/mmts/t/001_basic_recovery.pl b/contrib/mmts/t/001_basic_recovery.pl
@@ -60,7 +60,8 @@
 diag("starting node 2");
 $cluster->{nodes}->[2]->start;
 diag("sleeping 10");
-sleep(10); # XXX: here we can poll
+#sleep(10); # XXX: here we can poll
+$cluster->psql(0, 'postgres', "select mtm.poll_node(3);");
 diag("inserting 3");
 $cluster->psql(0, 'postgres', "insert into t values(3, 30);");
 diag("selecting");

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-rm -rf /home/knizhnik/postgres_cluster/contrib/mmts/tmp_check/log`
	`1`	`+rm -rf /home/knizhnik/postgres_cluster/contrib/mmts/tmp_check`
`2`	`2`	`TESTDIR='/home/knizhnik/postgres_cluster/contrib/mmts' PATH="/home/knizhnik/postgres_cluster/tmp_install/home/knizhnik/postgres_cluster/dist/bin:$PATH" LD_LIBRARY_PATH="/home/knizhnik/postgres_cluster/tmp_install/home/knizhnik/postgres_cluster/dist/lib:$LD_LIBRARY_PATH" PGPORT='65432' PG_REGRESS='/home/knizhnik/postgres_cluster/contrib/mmts/../../src/test/regress/pg_regress' prove -I ../../src/test/perl/ --verbose t/001_basic_recovery.pl`