prometheus/cadvisor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1770 from dashpole/fix_overlay2

Browse Source 
Monitor diff directory for overlay2
This commit is contained in:
Derek Carr 2017-10-18 11:39:09 -04:00 committed by GitHub
commit 90bb0524fe
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
container/docker/handler.go
View File

@ -43,7 +43,8 @@ import (
const ( const (
// The read write layers exist here. // 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. // Path to the directory where docker stores log files if the json logging driver is enabled.
pathToContainersDir = "containers" pathToContainersDir = "containers"
@ -195,8 +196,10 @@ func newDockerContainerHandler(
switch storageDriver { switch storageDriver {
case aufsStorageDriver: case aufsStorageDriver:
rootfsStorageDir = path.Join(storageDir, string(aufsStorageDriver), aufsRWLayer, rwLayerID) rootfsStorageDir = path.Join(storageDir, string(aufsStorageDriver), aufsRWLayer, rwLayerID)
case overlayStorageDriver, overlay2StorageDriver: case overlayStorageDriver:
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID) rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID)
case overlay2StorageDriver:
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlay2RWLayer)
case zfsStorageDriver: case zfsStorageDriver:
status, err := Status() status, err := Status()
if err != nil { if err != nil {