Skip to content

K
k3s
Commit c49d8360 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #31958 from ZTE-PaaS/zhangke-patch-034

Automatic merge from submit-queue Redundant code process for container_mananger start 1. need not sum the total numEnsureStateFuncs 2. numEnsureStateFuncs should > 0, otherwise, calculate numEnsureStateFuncs would be not neccessary
parents f6b8cdad eca14886
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
pkg/kubelet/cm/container_manager_linux.go
View file @ c49d8360
...@@ -466,13 +466,14 @@ func (cm *containerManagerImpl) Start(node *api.Node) error { ...@@ -466,13 +466,14 @@ func (cm *containerManagerImpl) Start(node *api.Node) error {
return err return err
} }
// Don't run a background thread if there are no ensureStateFuncs. // Don't run a background thread if there are no ensureStateFuncs.
numEnsureStateFuncs := 0 hasEnsureStateFuncs := false
for _, cont := range cm.systemContainers { for _, cont := range cm.systemContainers {
if cont.ensureStateFunc != nil { if cont.ensureStateFunc != nil {
numEnsureStateFuncs++ hasEnsureStateFuncs = true
break
} }
} }
if numEnsureStateFuncs >= 0 { if hasEnsureStateFuncs {
// Run ensure state functions every minute. // Run ensure state functions every minute.
go wait.Until(func() { go wait.Until(func() {
for _, cont := range cm.systemContainers { for _, cont := range cm.systemContainers {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment