Commit5a20755

authored and

committed

Check that node 2 stops in tap-test 001. Make Cluster remove the node's pidfile when stopping one.

1 parentdf87ce7 commit5a20755Copy full SHA for 5a20755

File tree

+19

-2

lines changed

+19

-2

lines changed

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,9 @@ sub stopnode`
`142`	`142`
`143`	`143`	`my$pgdata =$node->data_dir;`
`144`	`144`	`my$ret = TestLib::system_log('pg_ctl','-D',$pgdata,'-m','fast','stop');`
	`145`	`+my$pidfile =$node->data_dir ."/postmaster.pid";`
	`146`	`+diag("unlink$pidfile");`
	`147`	`+unlink$pidfile;`
`145`	`148`	`$node->{_pid} =undef;`
`146`	`149`	`$node->_update_pid;`
`147`	`150`
`@@ -153,6 +156,12 @@ sub stopnode`
`153`	`156`	`return 1;`
`154`	`157`	`}`
`155`	`158`
	`159`	`+substopid`
	`160`	`+{`
	`161`	`+my ($self,$idx,$mode) =@_;`
	`162`	`+return stopnode($self->{nodes}->[$idx]);`
	`163`	`+}`
	`164`	`+`
`156`	`165`	`subkilltree`
`157`	`166`	`{`
`158`	`167`	`my$root =shift;`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`use warnings;`
`3`	`3`	`use Cluster;`
`4`	`4`	`use TestLib;`
`5`		`-use Test::Moretests=>8;`
	`5`	`+use Test::Moretests=>9;`
`6`	`6`
`7`	`7`	`my$cluster = new Cluster(3);`
`8`	`8`	`$cluster->init();`
`@@ -39,7 +39,15 @@`
`39`	`39`	`###############################################################################`
`40`	`40`
`41`	`41`	`diag("stopping node 2");`
`42`		`-$cluster->{nodes}->[2]->teardown_node;`
	`42`	`+if ($cluster->stopid(2,'immediate')) {`
	`43`	`+pass("node 2 stops");`
	`44`	`+}else {`
	`45`	`+fail("node 2 stops");`
	`46`	`+if (!$cluster->stopid(2,'kill')) {`
	`47`	`+my$name =$cluster->{nodes}->[2]->name;`
	`48`	`+BAIL_OUT("failed to kill$name");`
	`49`	`+}`
	`50`	`+}`
`43`	`51`
`44`	`52`	`sleep(5);# Wait until failure of node will be detected`
`45`	`53`

Comments

(0)