ImageService: rename GraphDriverName to StorageDriver, remove daemon.graphdriver #43982
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Make the function name more generic, as it's no longer used only for graphdrivers but also for snapshotters. Signed-off-by: Sebastiaan van Stijn <[email protected]>
Make the ImageService the source of truth for the storage-driver that's used. Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
added
area/storage
thaJeztah
commented
Aug 18, 2022
| // StorageDriver returns the name of the default storage-driver (snapshotter) | ||
| // used by the ImageService. | ||
| func (i *ImageService) StorageDriver() string { | ||
| return "" |
Member
Author
There was a problem hiding this comment.
currently always empty, but will be propagated once rumpl#40 is upstreamed
It was only used as an intermediate variable to store what's returned by layerstore.DriverName() / ImageService.StorageDriver() Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
daemon_remove_graphdriver_field
branch
from
a4be51d to
d2276ff
Compare
rumpl
reviewed
Aug 18, 2022
Comment on lines
-954
to
-956
| // As layerstore initialization may set the driver | ||
| d.graphDriver = layerStore.DriverName() | ||
|
|
Member
There was a problem hiding this comment.
With this code removed, what happens if the layer store sets the driver? Is it moved to the image service storage driver?
Member
Author
There was a problem hiding this comment.
For the old (graph driver) image store, ImageService.StorageDriver() is just a proxy for layerstore.DriverName(), so the layerstore remains the source of truth;
Lines 178 to 180 in 6f8ea5b
And for snapshotters, it will use the snapshotter name (see https://github.com/moby/moby/pull/43982/files#r948993572 above)
cpuguy83
approved these changes
Aug 19, 2022
tianon
approved these changes
Aug 19, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ImageService: rename GraphDriverName to StorageDriver
Make the function name more generic, as it's no longer used only for graphdrivers but also for snapshotters.
daemon: info: fillDriverInfo() get driver-name from ImageService
Make the ImageService the source of truth for the storage-driver that's used.
daemon: remove daemon.graphdriver
It was only used as an intermediate variable to store what's returned
by layerstore.DriverName() / ImageService.StorageDriver()
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)