Fix mtm_poll_node function

knizhnik · kelvich · commit ae868c9e2c48 · 2017-11-13T02:17:30.000+03:00
diff --git a/Cluster.pm b/Cluster.pm
@@ -101,6 +101,8 @@ sub configure
 			multimaster.node_id = $id
 			multimaster.conn_strings = '$connstr'
 			multimaster.use_raftable = true
+			multimaster.heartbeat_recv_timeout = 1000
+			multimaster.heartbeat_send_timeout = 250
 			multimaster.ignore_tables_without_pk = true
 			multimaster.twopc_min_timeout = 2000
 			raftable.id = $id
diff --git a/multimaster.c b/multimaster.c
@@ -2619,7 +2619,7 @@ mtm_poll_node(PG_FUNCTION_ARGS)
 	bool nowait = PG_GETARG_BOOL(1);
 	bool online = true;
 	while ((nodeId == MtmNodeId && Mtm->status != MTM_ONLINE)
-		   || (nodeId =! MtmNodeId && BIT_CHECK(Mtm->disabledNodeMask, nodeId-1))) 
+		   || (nodeId != MtmNodeId && BIT_CHECK(Mtm->disabledNodeMask, nodeId-1))) 
 	{ 
 		if (nowait) { 
 			online = false;
diff --git a/t/001_basic_recovery.pl b/t/001_basic_recovery.pl
@@ -71,14 +71,14 @@
 diag("starting node 2");
 $cluster->{nodes}->[2]->start;
 
-$cluster->psql(0, 'postgres', "select mtm.poll_node(3);");
-
 diag("inserting 6 on node 1 (can fail)");
 $cluster->psql(0, 'postgres', "insert into t values(6, 60);"); 
 diag("inserting 7 on node 2 (can fail)");
 $cluster->psql(1, 'postgres', "insert into t values(7, 70);");
 
-sleep(5); # Wait until recovery of node will be completed
+$cluster->psql(0, 'postgres', "select mtm.poll_node(3);");
+$cluster->psql(1, 'postgres', "select mtm.poll_node(3);");
+$cluster->psql(2, 'postgres', "select mtm.poll_node(3);");
 
 $cluster->psql(0, 'postgres', "select * from mtm.get_cluster_state();", stdout => \$psql_out);
 diag("Node 1 status: $psql_out");

Original file line number	Diff line number	Diff line change
`@@ -2619,7 +2619,7 @@ mtm_poll_node(PG_FUNCTION_ARGS)`
`2619`	`2619`	`bool nowait = PG_GETARG_BOOL(1);`
`2620`	`2620`	`bool online = true;`
`2621`	`2621`	`while ((nodeId == MtmNodeId && Mtm->status != MTM_ONLINE)`
`2622`		`- \|\| (nodeId =! MtmNodeId && BIT_CHECK(Mtm->disabledNodeMask, nodeId-1)))`
	`2622`	`+ \|\| (nodeId != MtmNodeId && BIT_CHECK(Mtm->disabledNodeMask, nodeId-1)))`
`2623`	`2623`	`{`
`2624`	`2624`	`if (nowait) {`
`2625`	`2625`	`online = false;`