Merge pull request #1882 from dashpole/overlay_upper

monitor only the upper directory for overlay
This commit is contained in:
David Ashpole 2018-02-08 11:18:43 -08:00 committed by GitHub
commit 6116f26530
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -44,6 +44,7 @@ import (
const ( const (
// The read write layers exist here. // The read write layers exist here.
aufsRWLayer = "diff" aufsRWLayer = "diff"
overlayRWLayer = "upper"
overlay2RWLayer = "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.
@ -197,7 +198,7 @@ func newDockerContainerHandler(
case aufsStorageDriver: case aufsStorageDriver:
rootfsStorageDir = path.Join(storageDir, string(aufsStorageDriver), aufsRWLayer, rwLayerID) rootfsStorageDir = path.Join(storageDir, string(aufsStorageDriver), aufsRWLayer, rwLayerID)
case overlayStorageDriver: case overlayStorageDriver:
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID) rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlayRWLayer)
case overlay2StorageDriver: case overlay2StorageDriver:
rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlay2RWLayer) rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlay2RWLayer)
case zfsStorageDriver: case zfsStorageDriver: