Skip to content

ImageService: rename GraphDriverName to StorageDriver, remove daemon.graphdriver #43982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tianon merged 3 commits into from
Aug 19, 2022
Merged

ImageService: rename GraphDriverName to StorageDriver, remove daemon.graphdriver #43982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8dd1450
ImageService: rename GraphDriverName to StorageDriver
thaJeztah Aug 9, 2022
c6eab40
daemon: info: fillDriverInfo() get driver-name from ImageService
thaJeztah Aug 9, 2022
d2276ff
daemon: remove daemon.graphdriver
thaJeztah Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion daemon/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ func (daemon *Daemon) newContainer(name string, operatingSystem string, config *
base.ImageID = imgID
base.NetworkSettings = &network.Settings{IsAnonymousEndpoint: noExplicitName}
base.Name = name
base.Driver = daemon.imageService.GraphDriverName()
base.Driver = daemon.imageService.StorageDriver()
base.OS = operatingSystem
return base, err
}
Expand Down
7 changes: 3 additions & 4 deletions daemon/containerd/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,9 @@ func (i *ImageService) Cleanup() error {
return nil
}

// GraphDriverName returns the name of the graph drvier
// moved from Daemon.GraphDriverName, used by:
// - newContainer
func (i *ImageService) GraphDriverName() string {
// StorageDriver returns the name of the default storage-driver (snapshotter)
// used by the ImageService.
func (i *ImageService) StorageDriver() string {
return ""
Copy link
Member Author

@thaJeztah thaJeztah Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

currently always empty, but will be propagated once rumpl#40 is upstreamed

}

Expand Down
21 changes: 9 additions & 12 deletions daemon/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ type Daemon struct {
sysInfo *sysinfo.SysInfo
shutdown bool
idMapping idtools.IdentityMapping
graphDriver string // TODO: move graphDriver field to an InfoService
PluginStore *plugin.Store // TODO: remove
pluginManager *plugin.Manager
linkIndex *linkIndex
Expand Down Expand Up @@ -239,7 +238,7 @@ func (daemon *Daemon) restore() error {
log.WithError(err).Error("failed to load container")
return
}
if c.Driver != daemon.graphDriver {
if c.Driver != daemon.imageService.StorageDriver() {
// Ignore the container if it wasn't created with the current storage-driver
log.Debugf("not restoring container because it was created with another storage driver (%s)", c.Driver)
return
Expand Down Expand Up @@ -834,18 +833,19 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
}
}

var graphDriver string
if isWindows {
// On Windows we don't support the environment variable, or a user supplied graphdriver
d.graphDriver = "windowsfilter"
graphDriver = "windowsfilter"
} else {
// Unix platforms however run a single graphdriver for all containers, and it can
// be set through an environment variable, a daemon start parameter, or chosen through
// initialization of the layerstore through driver priority order for example.
if drv := os.Getenv("DOCKER_DRIVER"); drv != "" {
d.graphDriver = drv
graphDriver = drv
logrus.Infof("Setting the storage driver from the $DOCKER_DRIVER environment variable (%s)", drv)
} else {
d.graphDriver = config.GraphDriver // May still be empty. Layerstore init determines instead.
graphDriver = config.GraphDriver // May still be empty. Layerstore init determines instead.
}
}

Expand Down Expand Up @@ -941,7 +941,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
layerStore, err := layer.NewStoreFromOptions(layer.StoreOptions{
Root: config.Root,
MetadataStorePathTemplate: filepath.Join(config.Root, "image", "%s", "layerdb"),
GraphDriver: d.graphDriver,
GraphDriver: graphDriver,
GraphDriverOptions: config.GraphOptions,
IDMapping: idMapping,
PluginGetter: d.PluginStore,
Expand All @@ -951,16 +951,13 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
return nil, err
}

// As layerstore initialization may set the driver
d.graphDriver = layerStore.DriverName()

Comment on lines -954 to -956
Copy link
Member

@rumpl rumpl Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With this code removed, what happens if the layer store sets the driver? Is it moved to the image service storage driver?

Copy link
Member Author

@thaJeztah thaJeztah Aug 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the old (graph driver) image store, ImageService.StorageDriver() is just a proxy for layerstore.DriverName(), so the layerstore remains the source of truth;

moby/daemon/images/service.go

Lines 178 to 180 in 6f8ea5b

func (i *ImageService) GraphDriverName() string {
return i.layerStore.DriverName()
}

And for snapshotters, it will use the snapshotter name (see https://github.com/moby/moby/pull/43982/files#r948993572 above)

// Configure and validate the kernels security support. Note this is a Linux/FreeBSD
// operation only, so it is safe to pass *just* the runtime OS graphdriver.
if err := configureKernelSecuritySupport(config, d.graphDriver); err != nil {
if err := configureKernelSecuritySupport(config, layerStore.DriverName()); err != nil {
return nil, err
}

imageRoot := filepath.Join(config.Root, "image", d.graphDriver)
imageRoot := filepath.Join(config.Root, "image", layerStore.DriverName())

d.volumes, err = volumesservice.NewVolumeService(config.Root, d.PluginStore, rootIDs, d)
if err != nil {
Expand Down Expand Up @@ -1125,7 +1122,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
logrus.WithFields(logrus.Fields{
"version": dockerversion.Version,
"commit": dockerversion.GitCommit,
"graphdriver": d.graphDriver,
"graphdriver": d.ImageService().StorageDriver(),
}).Info("Docker daemon")

return d, nil
Expand Down
2 changes: 1 addition & 1 deletion daemon/image_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ type ImageService interface {
DistributionServices() images.DistributionServices
Children(id image.ID) []image.ID
Cleanup() error
GraphDriverName() string
StorageDriver() string
UpdateConfig(maxDownloads, maxUploads int)
}
6 changes: 2 additions & 4 deletions daemon/images/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,8 @@ func (i *ImageService) Cleanup() error {
return nil
}

// GraphDriverName returns the name of the graph drvier
// moved from Daemon.GraphDriverName, used by:
// - newContainer
func (i *ImageService) GraphDriverName() string {
// StorageDriver returns the name of the storage driver used by the ImageService.
func (i *ImageService) StorageDriver() string {
return i.layerStore.DriverName()
}

Expand Down
10 changes: 5 additions & 5 deletions daemon/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,18 +120,18 @@ func (daemon *Daemon) SystemVersion() types.Version {
}

func (daemon *Daemon) fillDriverInfo(v *types.Info) {
v.Driver = daemon.imageService.StorageDriver()
v.DriverStatus = daemon.imageService.LayerStoreStatus()

const warnMsg = `
WARNING: The %s storage-driver is deprecated, and will be removed in a future release.
Refer to the documentation for more information: https://docs.docker.com/go/storage-driver/`

switch daemon.graphDriver {
switch v.Driver {
case "aufs", "devicemapper", "overlay":
v.Warnings = append(v.Warnings, fmt.Sprintf(warnMsg, daemon.graphDriver))
v.Warnings = append(v.Warnings, fmt.Sprintf(warnMsg, v.Driver))
}

v.Driver = daemon.graphDriver
v.DriverStatus = daemon.imageService.LayerStoreStatus()

fillDriverWarnings(v)
}

Expand Down