From 8aea7ea60c647145329165e32887cf78e9fe54d1 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Wed, 11 Oct 2017 14:13:42 -0700 Subject: [PATCH] monitor diff directory for overlay2 --- container/docker/handler.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/container/docker/handler.go b/container/docker/handler.go index dab60eabe3..544a087fc8 100644 --- a/container/docker/handler.go +++ b/container/docker/handler.go @@ -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" @@ -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 {