Update to latest cadvisor - cleanup mesos/rkt

Change-Id: Ib5ae0cb13b93f8c87bb74e3ba33040df5f3d6a6f

vendor/github.com/google/cadvisor/manager/manager.go

@@ -30,27 +30,19 @@ import (
 	"github.com/google/cadvisor/cache/memory"
 	"github.com/google/cadvisor/collector"
 	"github.com/google/cadvisor/container"
-	"github.com/google/cadvisor/container/containerd"
-	"github.com/google/cadvisor/container/crio"
 	"github.com/google/cadvisor/container/docker"
-	"github.com/google/cadvisor/container/mesos"
 	"github.com/google/cadvisor/container/raw"
-	"github.com/google/cadvisor/container/rkt"
-	"github.com/google/cadvisor/container/systemd"
 	"github.com/google/cadvisor/events"
 	"github.com/google/cadvisor/fs"
 	info "github.com/google/cadvisor/info/v1"
 	"github.com/google/cadvisor/info/v2"
 	"github.com/google/cadvisor/machine"
-	"github.com/google/cadvisor/manager/watcher"
-	rawwatcher "github.com/google/cadvisor/manager/watcher/raw"
-	rktwatcher "github.com/google/cadvisor/manager/watcher/rkt"
 	"github.com/google/cadvisor/utils/oomparser"
 	"github.com/google/cadvisor/utils/sysfs"
 	"github.com/google/cadvisor/version"
+	"github.com/google/cadvisor/watcher"
 
 	"github.com/opencontainers/runc/libcontainer/cgroups"
-	"golang.org/x/net/context"
 	"k8s.io/klog"
 	"k8s.io/utils/clock"
 )
@@ -62,8 +54,6 @@ var eventStorageAgeLimit = flag.String("event_storage_age_limit", "default=24h",
 var eventStorageEventLimit = flag.String("event_storage_event_limit", "default=100000", "Max number of events to store (per type). Value is a comma separated list of key values, where the keys are event types (e.g.: creation, oom) or \"default\" and the value is an integer. Default is applied to all non-specified event types")
 var applicationMetricsCountLimit = flag.Int("application_metrics_count_limit", 100, "Max number of application metrics to store (per container)")
 
-const dockerClientTimeout = 10 * time.Second
-
 // The Manager interface defines operations for starting a manager and getting
 // container and machine information.
 type Manager interface {
@@ -155,40 +145,12 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn
 	}
 	klog.V(2).Infof("cAdvisor running in container: %q", selfContainer)
 
-	var (
-		dockerStatus info.DockerStatus
-		rktPath      string
-	)
-	docker.SetTimeout(dockerClientTimeout)
-	// Try to connect to docker indefinitely on startup.
-	dockerStatus = retryDockerStatus()
+	context := fs.Context{}
 
-	if tmpRktPath, err := rkt.RktPath(); err != nil {
-		klog.V(5).Infof("Rkt not connected: %v", err)
-	} else {
-		rktPath = tmpRktPath
-	}
-
-	crioClient, err := crio.Client()
-	if err != nil {
+	if err := container.InitializeFSContext(&context); err != nil {
 		return nil, err
 	}
-	crioInfo, err := crioClient.Info()
-	if err != nil {
-		klog.V(5).Infof("CRI-O not connected: %v", err)
-	}
 
-	context := fs.Context{
-		Docker: fs.DockerContext{
-			Root:         docker.RootDir(),
-			Driver:       dockerStatus.Driver,
-			DriverStatus: dockerStatus.DriverStatus,
-		},
-		RktPath: rktPath,
-		Crio: fs.CrioContext{
-			Root: crioInfo.StorageRoot,
-		},
-	}
 	fsInfo, err := fs.NewFsInfo(context)
 	if err != nil {
 		return nil, err
@@ -240,31 +202,6 @@ func New(memoryCache *memory.InMemoryCache, sysfs sysfs.SysFs, maxHousekeepingIn
 	return newManager, nil
 }
 
-func retryDockerStatus() info.DockerStatus {
-	startupTimeout := dockerClientTimeout
-	maxTimeout := 4 * startupTimeout
-	for {
-		ctx, _ := context.WithTimeout(context.Background(), startupTimeout)
-		dockerStatus, err := docker.StatusWithContext(ctx)
-		if err == nil {
-			return dockerStatus
-		}
-
-		switch err {
-		case context.DeadlineExceeded:
-			klog.Warningf("Timeout trying to communicate with docker during initialization, will retry")
-		default:
-			klog.V(5).Infof("Docker not connected: %v", err)
-			return info.DockerStatus{}
-		}
-
-		startupTimeout = 2 * startupTimeout
-		if startupTimeout > maxTimeout {
-			startupTimeout = maxTimeout
-		}
-	}
-}
-
 // A namespaced container name.
 type namespacedContainerName struct {
 	// The namespace of the container. Can be empty for the root namespace.
@@ -300,48 +237,14 @@ type manager struct {
 
 // Start the container manager.
 func (self *manager) Start() error {
-	err := docker.Register(self, self.fsInfo, self.includedMetrics)
-	if err != nil {
-		klog.V(5).Infof("Registration of the Docker container factory failed: %v.", err)
-	}
+	self.containerWatchers = container.InitializePlugins(self, self.fsInfo, self.includedMetrics)
 
-	err = rkt.Register(self, self.fsInfo, self.includedMetrics)
-	if err != nil {
-		klog.V(5).Infof("Registration of the rkt container factory failed: %v", err)
-	} else {
-		watcher, err := rktwatcher.NewRktContainerWatcher()
-		if err != nil {
-			return err
-		}
-		self.containerWatchers = append(self.containerWatchers, watcher)
-	}
-
-	err = containerd.Register(self, self.fsInfo, self.includedMetrics)
-	if err != nil {
-		klog.V(5).Infof("Registration of the containerd container factory failed: %v", err)
-	}
-
-	err = crio.Register(self, self.fsInfo, self.includedMetrics)
-	if err != nil {
-		klog.V(5).Infof("Registration of the crio container factory failed: %v", err)
-	}
-
-	err = mesos.Register(self, self.fsInfo, self.includedMetrics)
-	if err != nil {
-		klog.V(5).Infof("Registration of the mesos container factory failed: %v", err)
-	}
-
-	err = systemd.Register(self, self.fsInfo, self.includedMetrics)
-	if err != nil {
-		klog.V(5).Infof("Registration of the systemd container factory failed: %v", err)
-	}
-
-	err = raw.Register(self, self.fsInfo, self.includedMetrics, self.rawContainerCgroupPathPrefixWhiteList)
+	err := raw.Register(self, self.fsInfo, self.includedMetrics, self.rawContainerCgroupPathPrefixWhiteList)
 	if err != nil {
 		klog.Errorf("Registration of the raw container factory failed: %v", err)
 	}
 
-	rawWatcher, err := rawwatcher.NewRawContainerWatcher()
+	rawWatcher, err := raw.NewRawContainerWatcher()
 	if err != nil {
 		return err
 	}