overlay: Put should ignore ENINVAL for Unmount

It seems there are cases where underlying layers can be already unmounted in such case the layer directory is not removed and put fails early with `EINVAL` causing dangling directory for these layers. Following case may be a hidden underlying issue with `unmounting` of `c/stoage` which needs more investigation however prior discussion shows that this is a long standing issue in `storage` and which was never caught till containers#1607 Signed-off-by: Aditya R <[email protected]>
flouthoc · Aug 14, 2023 · 6469e60 · 6469e60
1 parent 82ebd53
commit 6469e60
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/drivers/overlay/overlay.go b/drivers/overlay/overlay.go
@@ -1879,7 +1879,9 @@ func (d *Driver) Put(id string) error {
 	if !unmounted {
 		if err := unix.Unmount(mountpoint, unix.MNT_DETACH); err != nil && !os.IsNotExist(err) {
 			logrus.Debugf("Failed to unmount %s overlay: %s - %v", id, mountpoint, err)
-			return fmt.Errorf("unmounting %q: %w", mountpoint, err)
+			if !errors.Is(err, unix.EINVAL) {
+				return fmt.Errorf("unmounting %q: %w", mountpoint, err)
+			}
 		}
 	}