github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18301 from yujuhong/remove_wait

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-15 02:51:55 -08:00
commit 25acc9bafa
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/kubelet/kubelet.go
View File

@ -144,20 +144,6 @@ type SyncHandler interface {
type SourcesReadyFn func(sourcesSeen sets.String) bool 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. // New instantiates a new Kubelet object along with all the required internal modules.
// No initialization of Kubelet and its modules should happen here. // No initialization of Kubelet and its modules should happen here.
func NewMainKubelet( func NewMainKubelet(
@ -2594,15 +2580,12 @@ func (kl *Kubelet) GetPodByName(namespace, name string) (*api.Pod, bool) {
} }
func (kl *Kubelet) updateRuntimeUp() { func (kl *Kubelet) updateRuntimeUp() {
start := time.Now() if _, err := kl.containerRuntime.Version(); err != nil {
err := waitUntilRuntimeIsUp(kl.containerRuntime, 100*time.Millisecond) glog.Errorf("Container runtime sanity check failed: %v", err)
if err == nil { return
// 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)
} }
kl.oneTimeInitializer.Do(kl.initializeRuntimeDependentModules)
kl.runtimeState.setRuntimeSync(time.Now())
} }
func (kl *Kubelet) reconcileCBR0(podCIDR string) error { func (kl *Kubelet) reconcileCBR0(podCIDR string) error {