From e0d9ccde6505779bc89681338fdeeebc33f7281b Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Mon, 7 Dec 2015 11:12:20 -0800
Subject: [PATCH] Minor clean up on checking container runtime status

Remove redundant function and consolidate the code.
---
 pkg/kubelet/kubelet.go | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index caa907b90ad..270b344a785 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -143,20 +143,6 @@ type SyncHandler interface {
 
 type SourcesReadyFn func(sourcesSeen sets.String) bool
 
-// Wait for the container runtime to be up with a timeout.
-func waitUntilRuntimeIsUp(cr kubecontainer.Runtime, timeout time.Duration) error {
-	var err error = nil
-	waitStart := time.Now()
-	for time.Since(waitStart) < timeout {
-		_, err = cr.Version()
-		if err == nil {
-			return nil
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-	return err
-}
-
 // New instantiates a new Kubelet object along with all the required internal modules.
 // No initialization of Kubelet and its modules should happen here.
 func NewMainKubelet(
@@ -2583,15 +2569,12 @@ func (kl *Kubelet) GetPodByName(namespace, name string) (*api.Pod, bool) {
 }
 
 func (kl *Kubelet) updateRuntimeUp() {
-	start := time.Now()
-	err := waitUntilRuntimeIsUp(kl.containerRuntime, 100*time.Millisecond)
-	if err == nil {
-		// Errors in initialization will be synchronized internally.
-		kl.oneTimeInitializer.Do(kl.initializeRuntimeDependentModules)
-		kl.runtimeState.setRuntimeSync(time.Now())
-	} else {
-		glog.Errorf("Container runtime sanity check failed after %v, err: %v", time.Since(start), err)
+	if _, err := kl.containerRuntime.Version(); err != nil {
+		glog.Errorf("Container runtime sanity check failed: %v", err)
+		return
 	}
+	kl.oneTimeInitializer.Do(kl.initializeRuntimeDependentModules)
+	kl.runtimeState.setRuntimeSync(time.Now())
 }
 
 func (kl *Kubelet) reconcileCBR0(podCIDR string) error {