Retry rename on lock induced failures (re-fix) (#16461) (#16463)

zeripath · web-flow · commit e6c222511dec · 2021-07-16T17:48:39.000+01:00
Backport #16461 Unfortunately #16435 asserts the wrong error and should use os.LinkError not os.PathError. Fix #16439 Signed-off-by: Andrew Thornton <art27@cantab.net>
diff --git a/modules/util/remove.go b/modules/util/remove.go
@@ -64,7 +64,7 @@ func Rename(oldpath, newpath string) error {
 		if err == nil {
 			break
 		}
-		unwrapped := err.(*os.PathError).Err
+		unwrapped := err.(*os.LinkError).Err
 		if unwrapped == syscall.EBUSY || unwrapped == syscall.ENOTEMPTY || unwrapped == syscall.EPERM || unwrapped == syscall.EMFILE || unwrapped == syscall.ENFILE {
 			// try again
 			<-time.After(100 * time.Millisecond)

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func Rename(oldpath, newpath string) error {`
`64`	`64`	`if err == nil {`
`65`	`65`	`break`
`66`	`66`	`}`
`67`		`- unwrapped := err.(*os.PathError).Err`
	`67`	`+ unwrapped := err.(*os.LinkError).Err`
`68`	`68`	`if unwrapped == syscall.EBUSY \|\| unwrapped == syscall.ENOTEMPTY \|\| unwrapped == syscall.EPERM \|\| unwrapped == syscall.EMFILE \|\| unwrapped == syscall.ENFILE {`
`69`	`69`	`// try again`
`70`	`70`	`<-time.After(100 * time.Millisecond)`