Commitc289117

committed

Try to fix pg_upgrade test on Windows, again.

Further to commit54e72b6, if rmtree() fails while cleaning up inpg_upgrade, try again. This gives our Windows unlink() wrapper a chanceto reach its wait-for-the-other-process-to-go-away logic, if the firstgo around initiated the unlink of a file that a concurrently exitingprogram still has open.Discussion:https://postgr.es/m/CA%2BhUKGKCVy2%3Do%3Dd8c2Va6a_3Rpf_KkhUitkWCZ3hzuO2VwLMXA%40mail.gmail.com

1 parent758f44b commitc289117Copy full SHA for c289117

File tree

+13

-2

lines changed

+13

-2

lines changed

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,12 @@ cleanup_output_dirs(void)`
`68`	`68`	`if (log_opts.retain)`
`69`	`69`	`return;`
`70`	`70`
`71`		`-(void)rmtree(log_opts.basedir, true);`
	`71`	`+/*`
	`72`	`+ * Try twice. The second time might wait for files to finish being`
	`73`	`+ * unlinked, on Windows.`
	`74`	`+ */`
	`75`	`+if (!rmtree(log_opts.basedir, true))`
	`76`	`+rmtree(log_opts.basedir, true);`
`72`	`77`
`73`	`78`	`/* Remove pg_upgrade_output.d only if empty */`
`74`	`79`	`switch (pg_check_dir(log_opts.rootdir))`
`@@ -80,7 +85,13 @@ cleanup_output_dirs(void)`
`80`	`85`
`81`	`86`	`case1:/* exists and empty */`
`82`	`87`	`case2:/* exists and contains only dot files */`
`83`		`-(void)rmtree(log_opts.rootdir, true);`
	`88`	`+`
	`89`	`+/*`
	`90`	`+ * Try twice. The second time might wait for files to finish`
	`91`	`+ * being unlinked, on Windows.`
	`92`	`+ */`
	`93`	`+if (!rmtree(log_opts.rootdir, true))`
	`94`	`+rmtree(log_opts.rootdir, true);`
`84`	`95`	`break;`
`85`	`96`
`86`	`97`	`case4:/* exists */`

Comments

(0)