Commitb222feb

committed

Merge branch 'PGPROEE9_6_MULTIMASTER' ofhttps://gitlab.postgrespro.ru/pgpro-dev/postgrespro into PGPROEE9_6_MULTIMASTER

2 parentsb51abb4 +f51ffbf commitb222febCopy full SHA for b222feb

File tree

+24

-2

lines changed

+24

-2

lines changed

Lines changed: 24 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,29 @@ use TestLib;`
`8`	`8`	`use Test::More;`
`9`	`9`	`use Cwd;`
`10`	`10`
	`11`	`+use Socket;`
	`12`	`+`
	`13`	`+subcheck_port`
	`14`	`+{`
	`15`	`+my ($host,$port) =@_;`
	`16`	`+my$iaddr = inet_aton($host);`
	`17`	`+my$paddr = sockaddr_in($port,$iaddr);`
	`18`	`+my$proto =getprotobyname("tcp");`
	`19`	`+my$available = 0;`
	`20`	`+`
	`21`	`+socket(SOCK, PF_INET, SOCK_STREAM,$proto)`
	`22`	`+ordie"socket failed:$!";`
	`23`	`+`
	`24`	`+if (bind(SOCK,$paddr) &&listen(SOCK, SOMAXCONN))`
	`25`	`+{`
	`26`	`+$available = 1;`
	`27`	`+}`
	`28`	`+`
	`29`	`+close(SOCK);`
	`30`	`+diag("checking for port$port =$available\n");`
	`31`	`+return$available;`
	`32`	`+}`
	`33`	`+`
`11`	`34`	`my%allocated_ports = ();`
`12`	`35`	`suballocate_ports`
`13`	`36`	`{`
`@@ -18,8 +41,7 @@ sub allocate_ports`
`18`	`41`	`{`
`19`	`42`	`my$port =int(rand() * 16384) + 49152;`
`20`	`43`	`nextif$allocated_ports{$port};`
`21`		`-diag("checking for port$port\n");`
`22`		`-if (!TestLib::run_log(['pg_isready','-h',$host,'-p',$port]))`
	`44`	`+if (check_port($host,$port))`
`23`	`45`	`{`
`24`	`46`	`$allocated_ports{$port} = 1;`
`25`	`47`	`push(@allocated_now,$port);`

Comments

(0)