Don't validate docker state file, since it's no longer used

container/docker/factory.go

@@ -47,12 +47,6 @@ var dockerCgroupRegexp = regexp.MustCompile(`([a-z0-9]{64})`)
 
 var dockerEnvWhitelist = flag.String("docker_env_metadata_whitelist", "", "a comma-separated list of environment variable keys that needs to be collected for docker containers")
 
-// TODO(vmarmol): Export run dir too for newer Dockers.
-// Directory holding Docker container state information.
-func DockerStateDir() string {
-	return libcontainer.DockerStateDir(*dockerRootDir)
-}
-
 const (
 	dockerRootDirKey = "Root Dir"
 )

container/libcontainer/helpers.go

@@ -299,10 +299,6 @@ func GetProcesses(cgroupManager cgroups.Manager) ([]int, error) {
 	return pids, nil
 }
 
-func DockerStateDir(dockerRoot string) string {
-	return path.Join(dockerRoot, "containers")
-}
-
 func DiskStatsCopy0(major, minor uint64) *info.PerDiskStats {
 	disk := info.PerDiskStats{
 		Major: major,

validate/validate.go

@@ -191,12 +191,6 @@ func validateDockerInfo() (string, string) {
 	}
 
 	desc := fmt.Sprintf("Docker exec driver is %s. Storage driver is %s.\n", info.ExecutionDriver, info.Driver)
-	stateFile := docker.DockerStateDir()
-	if !utils.FileExists(stateFile) {
-		desc += fmt.Sprintf("\tDocker container state directory %q is not accessible.\n", stateFile)
-		return Unsupported, desc
-	}
-	desc += fmt.Sprintf("\tDocker container state directory is at %q and is accessible.\n", stateFile)
 	return Recommended, desc
 }