Merge pull request #5328 from kevpar/win-ci-cleanup

crosbymichael · web-flow · commit ada96ec19226 · 2021-06-03T11:15:39.000-04:00
Fix error case in Windows layer cleanup
diff --git a/sys/filesys_windows.go b/sys/filesys_windows.go
@@ -311,9 +311,10 @@ func cleanupWCOWLayer(layerPath string) error {
 		HomeDir: filepath.Dir(layerPath),
 	}
 
-	// ERROR_DEV_NOT_EXIST is returned if the layer is not currently prepared.
+	// ERROR_DEV_NOT_EXIST is returned if the layer is not currently prepared or activated.
+	// ERROR_FLT_INSTANCE_NOT_FOUND is returned if the layer is currently activated but not prepared.
 	if err := hcsshim.UnprepareLayer(info, filepath.Base(layerPath)); err != nil {
-		if hcserror, ok := err.(*hcsshim.HcsError); !ok || hcserror.Err != windows.ERROR_DEV_NOT_EXIST {
+		if hcserror, ok := err.(*hcsshim.HcsError); !ok || (hcserror.Err != windows.ERROR_DEV_NOT_EXIST && hcserror.Err != syscall.Errno(windows.ERROR_FLT_INSTANCE_NOT_FOUND)) {
 			return errors.Wrapf(err, "failed to unprepare %s", layerPath)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -311,9 +311,10 @@ func cleanupWCOWLayer(layerPath string) error {`
`311`	`311`	`HomeDir: filepath.Dir(layerPath),`
`312`	`312`	`}`
`313`	`313`
`314`		`- // ERROR_DEV_NOT_EXIST is returned if the layer is not currently prepared.`
	`314`	`+ // ERROR_DEV_NOT_EXIST is returned if the layer is not currently prepared or activated.`
	`315`	`+ // ERROR_FLT_INSTANCE_NOT_FOUND is returned if the layer is currently activated but not prepared.`
`315`	`316`	`if err := hcsshim.UnprepareLayer(info, filepath.Base(layerPath)); err != nil {`
`316`		`- if hcserror, ok := err.(*hcsshim.HcsError); !ok \|\| hcserror.Err != windows.ERROR_DEV_NOT_EXIST {`
	`317`	`+ if hcserror, ok := err.(*hcsshim.HcsError); !ok \|\| (hcserror.Err != windows.ERROR_DEV_NOT_EXIST && hcserror.Err != syscall.Errno(windows.ERROR_FLT_INSTANCE_NOT_FOUND)) {`
`317`	`318`	`return errors.Wrapf(err, "failed to unprepare %s", layerPath)`
`318`	`319`	`}`
`319`	`320`	`}`