kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

remove deprecated support for overlay(2) on backing FS without d_type (fstype=1)

Browse source 
Support for overlay on a backing filesystem without d_type was deprecated in
0abb8dec3f (Docker 17.12), with an exception
for existing installations (0a4e793a3d).

That deprecation was nearly 5 years ago, and running without d_type is known to
cause serious issues (so users will likely already have run into other problems).

This patch removes support for running overlay and overlay2 on these filesystems,
returning the error instead of logging it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2022-04-07 16:15:26 +02:00
parent a461373146
commit d570bc4922
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
daemon/graphdriver/overlay/overlay.go
View file

@ -147,11 +147,7 @@ func Init(home string, options []string, idMap idtools.IdentityMapping) (graphdr
return nil, err return nil, err
} }
if !supportsDType { if !supportsDType {
if !graphdriver.IsInitialized(home) { return nil, overlayutils.ErrDTypeNotSupported("overlay", backingFs)
return nil, overlayutils.ErrDTypeNotSupported("overlay", backingFs)
}
// allow running without d_type only for existing setups (#27443)
logrus.WithField("storage-driver", "overlay").Warn(overlayutils.ErrDTypeNotSupported("overlay", backingFs))
} }
currentID := idtools.CurrentIdentity() currentID := idtools.CurrentIdentity()

6
daemon/graphdriver/overlay2/overlay.go
View file

@ -156,11 +156,7 @@ func Init(home string, options []string, idMap idtools.IdentityMapping) (graphdr
return nil, err return nil, err
} }
if !supportsDType { if !supportsDType {
if !graphdriver.IsInitialized(home) { return nil, overlayutils.ErrDTypeNotSupported("overlay2", backingFs)
return nil, overlayutils.ErrDTypeNotSupported("overlay2", backingFs)
}
// allow running without d_type only for existing setups (#27443)
logger.Warn(overlayutils.ErrDTypeNotSupported("overlay2", backingFs))
} }
cur := idtools.CurrentIdentity() cur := idtools.CurrentIdentity()