Commit2beb4ac

committed

Add diagnostic output on error in pump_until

When pump_until was moved to Utils.pm in commit6da65a3 the diagcalls were removed, this puts them back.Per request from Andres Freund.Discussion:https://postgr.es/m/20220329225819.ahk5u2tax3ez6d2t@alap3.anarazel.de

1 parent8f2e2bb commit2beb4acCopy full SHA for 2beb4ac

File tree

+10

-2

lines changed

+10

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -426,8 +426,16 @@ sub pump_until`
`426`	`426`	`while (1)`
`427`	`427`	`{`
`428`	`428`	`lastif$$stream =~/$until/;`
`429`		`-return 0if ($timeout->is_expired);`
`430`		`-return 0if (not$proc->pumpable());`
	`429`	`+if ($timeout->is_expired)`
	`430`	`+{`
	`431`	`+diag("pump_until: timeout expired when searching for\"$until\" with stream:\"$$stream\"");`
	`432`	`+return 0;`
	`433`	`+}`
	`434`	`+if (not$proc->pumpable())`
	`435`	`+{`
	`436`	`+diag("pump_until: process terminated unexpectedly when searching for\"$until\" with stream:\"$$stream\"");`
	`437`	`+return 0;`
	`438`	`+}`
`431`	`439`	`$proc->pump();`
`432`	`440`	`}`
`433`	`441`	`return 1;`

Comments

(0)