Merge pull request #2934 from Dingshujie/fix_image_gc

if docker can't connect during InitializeFSContext , do not add image dev info to real fs info label cache

Author: bobbypage

fs/fs.go

@@ -284,15 +284,17 @@ func (i *RealFsInfo) addSystemRootLabel(mounts []*mount.Info) {
 
 // addDockerImagesLabel attempts to determine which device contains the mount for docker images.
 func (i *RealFsInfo) addDockerImagesLabel(context Context, mounts []*mount.Info) {
-	dockerDev, dockerPartition, err := i.getDockerDeviceMapperInfo(context.Docker)
-	if err != nil {
-		klog.Warningf("Could not get Docker devicemapper device: %v", err)
-	}
-	if len(dockerDev) > 0 && dockerPartition != nil {
-		i.partitions[dockerDev] = *dockerPartition
-		i.labels[LabelDockerImages] = dockerDev
-	} else {
-		i.updateContainerImagesPath(LabelDockerImages, mounts, getDockerImagePaths(context))
+	if context.Docker.Driver != "" {
+		dockerDev, dockerPartition, err := i.getDockerDeviceMapperInfo(context.Docker)
+		if err != nil {
+			klog.Warningf("Could not get Docker devicemapper device: %v", err)
+		}
+		if len(dockerDev) > 0 && dockerPartition != nil {
+			i.partitions[dockerDev] = *dockerPartition
+			i.labels[LabelDockerImages] = dockerDev
+		} else {
+			i.updateContainerImagesPath(LabelDockerImages, mounts, getDockerImagePaths(context))
+		}
 	}
 }
 

fs/fs_test.go

@@ -374,7 +374,8 @@ func TestAddDockerImagesLabel(t *testing.T) {
 		expectedPartition              *partition
 	}{
 		{
-			name: "single partition, no dedicated image fs",
+			name:   "single partition, no dedicated image fs",
+			driver: "overlay2",
 			mounts: []*mount.Info{
 				{
 					Source:     "/dev/root",
@@ -427,7 +428,8 @@ func TestAddDockerImagesLabel(t *testing.T) {
 			expectedDockerDevice: "/dev/sdb1",
 		},
 		{
-			name: "multiple mounts - innermost check",
+			name:   "multiple mounts - innermost check",
+			driver: "overlay2",
 			mounts: []*mount.Info{
 				{
 					Source:     "/dev/sda1",
@@ -448,7 +450,8 @@ func TestAddDockerImagesLabel(t *testing.T) {
 			expectedDockerDevice: "/dev/sdb2",
 		},
 		{
-			name: "root fs inside container, docker-images bindmount",
+			name:   "root fs inside container, docker-images bindmount",
+			driver: "overlay2",
 			mounts: []*mount.Info{
 				{
 					Source:     "overlay",
@@ -464,7 +467,8 @@ func TestAddDockerImagesLabel(t *testing.T) {
 			expectedDockerDevice: "/dev/sda1",
 		},
 		{
-			name: "[overlay2] root fs inside container - /var/lib/docker bindmount",
+			name:   "[overlay2] root fs inside container - /var/lib/docker bindmount",
+			driver: "overlay2",
 			mounts: []*mount.Info{
 				{
 					Source:     "overlay",