Commitae868c9

authored and

committed

Fix mtm_poll_node function

1 parent4ecb7b5 commitae868c9Copy full SHA for ae868c9

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,8 @@ sub configure`
`101`	`101`	`multimaster.node_id =$id`
`102`	`102`	`multimaster.conn_strings = '$connstr'`
`103`	`103`	`multimaster.use_raftable = true`
	`104`	`+multimaster.heartbeat_recv_timeout = 1000`
	`105`	`+multimaster.heartbeat_send_timeout = 250`
`104`	`106`	`multimaster.ignore_tables_without_pk = true`
`105`	`107`	`multimaster.twopc_min_timeout = 2000`
`106`	`108`	`raftable.id =$id`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2619,7 +2619,7 @@ mtm_poll_node(PG_FUNCTION_ARGS)`
`2619`	`2619`	`boolnowait=PG_GETARG_BOOL(1);`
`2620`	`2620`	`boolonline= 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;`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,14 +71,14 @@`
`71`	`71`	`diag("starting node 2");`
`72`	`72`	`$cluster->{nodes}->[2]->start;`
`73`	`73`
`74`		`-$cluster->psql(0,'postgres',"select mtm.poll_node(3);");`
`75`		`-`
`76`	`74`	`diag("inserting 6 on node 1 (can fail)");`
`77`	`75`	`$cluster->psql(0,'postgres',"insert into t values(6, 60);");`
`78`	`76`	`diag("inserting 7 on node 2 (can fail)");`
`79`	`77`	`$cluster->psql(1,'postgres',"insert into t values(7, 70);");`
`80`	`78`
`81`		`-sleep(5);# Wait until recovery of node will be completed`
	`79`	`+$cluster->psql(0,'postgres',"select mtm.poll_node(3);");`
	`80`	`+$cluster->psql(1,'postgres',"select mtm.poll_node(3);");`
	`81`	`+$cluster->psql(2,'postgres',"select mtm.poll_node(3);");`
`82`	`82`
`83`	`83`	`$cluster->psql(0,'postgres',"select * from mtm.get_cluster_state();",stdout=> \$psql_out);`
`84`	`84`	`diag("Node 1 status:$psql_out");`

Comments

(0)