NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit9a02dbd

committed

Retry initial slurp_file("current_logfiles"), in test 004_logrotate.pl.

Buildfarm member topminnow failed when the test script attempted thisbefore the syslogger would have created the file. Back-patch to v12,which introduced the test.

1 parentf5de090 commit9a02dbdCopy full SHA for 9a02dbd

File tree

1 file changed

+13

-4

lines changed

src/bin/pg_ctl/t
- 004_logrotate.pl

1 file changed

+13

-4

lines changed

`‎src/bin/pg_ctl/t/004_logrotate.pl`

Lines changed: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,19 @@`
`21`	`21`
`22`	`22`	`$node->psql('postgres','SELECT 1/0');`
`23`	`23`
`24`		`-my$current_logfiles = slurp_file($node->data_dir .'/current_logfiles');`
	`24`	`+# might need to retry if logging collector process is slow...`
	`25`	`+my$max_attempts = 180 * 10;`
	`26`	`+`
	`27`	`+my$current_logfiles;`
	`28`	`+for (my$attempts = 0;$attempts <$max_attempts;$attempts++)`
	`29`	`+{`
	`30`	`+eval {`
	`31`	`+$current_logfiles = slurp_file($node->data_dir .'/current_logfiles');`
	`32`	`+};`
	`33`	`+lastunless$@;`
	`34`	`+usleep(100_000);`
	`35`	`+}`
	`36`	`+die$@if$@;`
`25`	`37`
`26`	`38`	`note"current_logfiles =$current_logfiles";`
`27`	`39`
`@@ -34,9 +46,6 @@`
`34`	`46`	`$lfname =~s/^stderr//;`
`35`	`47`	`chomp$lfname;`
`36`	`48`
`37`		`-# might need to retry if logging collector process is slow...`
`38`		`-my$max_attempts = 180 * 10;`
`39`		`-`
`40`	`49`	`my$first_logfile;`
`41`	`50`	`for (my$attempts = 0;$attempts <$max_attempts;$attempts++)`
`42`	`51`	`{`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9a02dbd

File tree

1 file changed

1 file changed

`‎src/bin/pg_ctl/t/004_logrotate.pl`

0 commit comments