NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commitb054498

committed

Make error handling in parallel pg_upgrade less bogus.

reap_child() basically ignored the possibility of either an error inwaitpid() itself or a child process failure on signal. We don't reallyneed to do more than report and crash hard, but proceeding as thoughnothing is wrong is definitely Not Acceptable. The error report fornonzero child exit status was pretty off-point, as well.Noted while fooling around with child-process failure detectionlogic elsewhere. It's been like this a long time, so back-patch toall supported branches.

1 parentb1894a6 commitb054498Copy full SHA for b054498

File tree

1 file changed

-9

lines changed

src/bin/pg_upgrade
- parallel.c

1 file changed

-9

lines changed

`‎src/bin/pg_upgrade/parallel.c`

Lines changed: 8 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ reap_child(bool wait_for_child)`
`290`	`290`	`{`
`291`	`291`	`#ifndefWIN32`
`292`	`292`	`intwork_status;`
`293`		`-intret;`
	`293`	`+pid_tchild;`
`294`	`294`	`#else`
`295`	`295`	`intthread_num;`
`296`	`296`	`DWORDres;`
`@@ -300,14 +300,13 @@ reap_child(bool wait_for_child)`
`300`	`300`	`return false;`
`301`	`301`
`302`	`302`	`#ifndefWIN32`
`303`		`-ret=waitpid(-1,&work_status,wait_for_child ?0 :WNOHANG);`
`304`		`-`
`305`		`-/* no children or, for WNOHANG, no dead children */`
`306`		`-if (ret <=0\|\| !WIFEXITED(work_status))`
`307`		`-return false;`
`308`		`-`
`309`		`-if (WEXITSTATUS(work_status)!=0)`
`310`		`-pg_fatal("child worker exited abnormally: %s\n",strerror(errno));`
	`303`	`+child=waitpid(-1,&work_status,wait_for_child ?0 :WNOHANG);`
	`304`	`+if (child== (pid_t)-1)`
	`305`	`+pg_fatal("waitpid() failed: %s\n",strerror(errno));`
	`306`	`+if (child==0)`
	`307`	`+return false;/* no children, or no dead children */`
	`308`	`+if (work_status!=0)`
	`309`	`+pg_fatal("child process exited abnormally: status %d\n",work_status);`
`311`	`310`	`#else`
`312`	`311`	`/* wait for one to finish */`
`313`	`312`	`thread_num=WaitForMultipleObjects(parallel_jobs,thread_handles,`

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!

Commitb054498

File tree

1 file changed

1 file changed

`‎src/bin/pg_upgrade/parallel.c`

0 commit comments