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

Merge pull request #22311 from vishh/22198

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-03 20:55:20 -08:00
commit c8038a7751
3 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkg/kubelet/cm/container_manager_linux.go
View File

@ -324,28 +324,29 @@ func (cm *containerManagerImpl) Start() error {
numEnsureStateFuncs++ numEnsureStateFuncs++
} }
} }
if numEnsureStateFuncs == 0 { if numEnsureStateFuncs >= 0 {
return nil go wait.Until(func() {
for _, cont := range cm.systemContainers {
if cont.ensureStateFunc != nil {
if err := cont.ensureStateFunc(cont.manager); err != nil {
glog.Warningf("[ContainerManager] Failed to ensure state of %q: %v", cont.name, err)
}
}
}
}, time.Minute, wait.NeverStop)
} }
// Run ensure state functions every minute. // Run ensure state functions every minute.
go wait.Until(func() { if len(cm.periodicTasks) > 0 {
for _, cont := range cm.systemContainers { go wait.Until(func() {
if cont.ensureStateFunc != nil { for _, task := range cm.periodicTasks {
if err := cont.ensureStateFunc(cont.manager); err != nil { if task != nil {
glog.Warningf("[ContainerManager] Failed to ensure state of %q: %v", cont.name, err) task()
} }
} }
} }, 5*time.Minute, wait.NeverStop)
}, time.Minute, wait.NeverStop) }
go wait.Until(func() {
for _, task := range cm.periodicTasks {
if task != nil {
task()
}
}
}, 5*time.Minute, wait.NeverStop)
return nil return nil
} }

3
pkg/kubelet/kubelet.go
View File

@ -18,7 +18,6 @@ package kubelet
import ( import (
"bytes" "bytes"
"errors"
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
@ -929,7 +928,7 @@ func (kl *Kubelet) listPodsFromDisk() ([]types.UID, error) {
func (kl *Kubelet) GetNode() (*api.Node, error) { func (kl *Kubelet) GetNode() (*api.Node, error) {
if kl.standaloneMode { if kl.standaloneMode {
return nil, errors.New("no node entry for kubelet in standalone mode") return kl.initialNodeStatus()
} }
return kl.nodeInfo.GetNodeInfo(kl.nodeName) return kl.nodeInfo.GetNodeInfo(kl.nodeName)
} }

20
test/e2e_node/kubelet_test.go
View File

@ -198,16 +198,16 @@ var _ = Describe("Kubelet", func() {
Expect(summary.Node.Fs.UsedBytes).NotTo(BeNil()) Expect(summary.Node.Fs.UsedBytes).NotTo(BeNil())
Expect(*summary.Node.Fs.UsedBytes).NotTo(BeZero()) Expect(*summary.Node.Fs.UsedBytes).NotTo(BeZero())
// TODO: Enable this test when #22198 is resolved. By("Having resources for kubelet and runtime system containers")
// By("Having resources for kubelet and runtime system containers") sysContainers := map[string]stats.ContainerStats{}
// sysContainers := map[string]stats.ContainerStats{} sysContainersList := []string{}
// sysContainersList := []string{} for _, container := range summary.Node.SystemContainers {
// for _, container := range summary.Node.SystemContainers { sysContainers[container.Name] = container
// sysContainers[container.Name] = container sysContainersList = append(sysContainersList, container.Name)
// sysContainersList = append(sysContainersList, container.Name) ExpectContainerStatsNotEmpty(&container)
// ExpectContainerStatsNotEmpty(&container) }
// } Expect(sysContainersList).To(ContainElement("kubelet"))
// Expect(sysContainersList).To(ConsistOf("kubelet", "runtime")) Expect(sysContainersList).To(ContainElement("runtime"))
// Verify Pods Stats are present // Verify Pods Stats are present
podsList := []string{} podsList := []string{}