Skip to content

Monitor diff directory for overlay2 #1770

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
merged 1 commit into from
Oct 18, 2017
Merged

Monitor diff directory for overlay2 #1770

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
monitor diff directory for overlay2
  • Loading branch information
@dashpole
dashpole committed Oct 11, 2017
commit b7959da460700f90b27dc0dc166c957d3b03e2b0
7 changes: 5 additions & 2 deletions container/docker/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ import (

const (
// The read write layers exist here.
aufsRWLayer = "diff"
aufsRWLayer = "diff"
overlay2RWLayer = "diff"

// Path to the directory where docker stores log files if the json logging driver is enabled.
pathToContainersDir = "containers"
Expand Down Expand Up @@ -195,8 +196,10 @@ func newDockerContainerHandler(
switch storageDriver {
case aufsStorageDriver:
rootfsStorageDir = path.Join(storageDir, string(aufsStorageDriver), aufsRWLayer, rwLayerID)
case overlayStorageDriver, overlay2StorageDriver:
case overlayStorageDriver:
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID)
case overlay2StorageDriver:
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlay2RWLayer)
case zfsStorageDriver:
status, err := Status()
if err != nil {
Expand Down