Cherrypick overlay2 support for docker into v0.25

container/docker/factory.go

@@ -83,6 +83,7 @@ const (
 	devicemapperStorageDriver storageDriver = "devicemapper"
 	aufsStorageDriver         storageDriver = "aufs"
 	overlayStorageDriver      storageDriver = "overlay"
+	overlay2StorageDriver     storageDriver = "overlay2"
 	zfsStorageDriver          storageDriver = "zfs"
 )
 

container/docker/handler.go

@@ -41,7 +41,9 @@ 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"
 )
@@ -177,7 +179,9 @@ func newDockerContainerHandler(
 	case aufsStorageDriver:
 		rootfsStorageDir = path.Join(storageDir, string(aufsStorageDriver), aufsRWLayer, rwLayerID)
 	case overlayStorageDriver:
-		rootfsStorageDir = path.Join(storageDir, string(overlayStorageDriver), rwLayerID)
+		rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID)
+	case overlay2StorageDriver:
+		rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlay2RWLayer)
 	case devicemapperStorageDriver:
 		status, err := Status()
 		if err != nil {
@@ -359,7 +363,7 @@ func (self *dockerContainerHandler) getFsStats(stats *info.ContainerStats) error
 		// Device has to be the pool name to correlate with the device name as
 		// set in the machine info filesystems.
 		device = self.poolName
-	case aufsStorageDriver, overlayStorageDriver, zfsStorageDriver:
+	case aufsStorageDriver, overlayStorageDriver, overlay2StorageDriver, zfsStorageDriver:
 		deviceInfo, err := self.fsInfo.GetDirFsDevice(self.rootfsStorageDir)
 		if err != nil {
 			return fmt.Errorf("unable to determine device info for dir: %v: %v", self.rootfsStorageDir, err)

fs/fs.go

@@ -241,7 +241,7 @@ func getDockerImagePaths(context Context) map[string]struct{} {
 
 	// TODO(rjnagal): Detect docker root and graphdriver directories from docker info.
 	dockerRoot := context.Docker.Root
-	for _, dir := range []string{"devicemapper", "btrfs", "aufs", "overlay", "zfs"} {
+	for _, dir := range []string{"devicemapper", "btrfs", "aufs", "overlay", "overlay2", "zfs"} {
 		dockerImagePaths[path.Join(dockerRoot, dir)] = struct{}{}
 	}
 	for dockerRoot != "/" && dockerRoot != "." {

fs/fs_test.go

@@ -418,6 +418,27 @@ func TestAddDockerImagesLabel(t *testing.T) {
 			},
 			expectedDockerDevice: "/dev/sda1",
 		},
+		{
+			name: "[overlay2] root fs inside container - /var/lib/docker bindmount",
+			mounts: []*mount.Info{
+				{
+					Source:     "overlay",
+					Mountpoint: "/",
+					Fstype:     "overlay",
+				},
+				{
+					Source:     "/dev/sdb1",
+					Mountpoint: "/var/lib/docker",
+					Fstype:     "ext4",
+				},
+				{
+					Source:     "/dev/sdb2",
+					Mountpoint: "/var/lib/docker/overlay2",
+					Fstype:     "ext4",
+				},
+			},
+			expectedDockerDevice: "/dev/sdb2",
+		},
 	}
 
 	for _, tt := range tests {

integration/framework/framework.go

@@ -91,6 +91,7 @@ func New(t *testing.T) Framework {
 const (
 	Aufs         string = "aufs"
 	Overlay      string = "overlay"
+	Overlay2     string = "overlay2"
 	DeviceMapper string = "devicemapper"
 	Unknown      string = ""
 )
@@ -276,12 +277,8 @@ func (self dockerActions) StorageDriver() string {
 			idx := strings.LastIndex(line, ": ") + 2
 			driver := line[idx:]
 			switch driver {
-			case Aufs:
-				return Aufs
-			case Overlay:
-				return Overlay
-			case DeviceMapper:
-				return DeviceMapper
+			case Aufs, Overlay, Overlay2, DeviceMapper:
+				return driver
 			default:
 				return Unknown
 			}

integration/tests/api/docker_test.go

@@ -333,7 +333,7 @@ func TestDockerFilesystemStats(t *testing.T) {
 	}
 	needsBaseUsageCheck := false
 	switch storageDriver {
-	case framework.Aufs, framework.Overlay, framework.DeviceMapper:
+	case framework.Aufs, framework.Overlay, framework.Overlay2, framework.DeviceMapper:
 		needsBaseUsageCheck = true
 	}
 	pass := false