github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #24384 from Random-Liu/disable-version-cache 

Disable the version cache to fix #24298.
pull/6/head
Wojciech Tyczynski 2016-04-17 04:48:07 -07:00
parent 2bf52175f9 19249a8cbc
commit 495e274500
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/dockertools/fake_manager.go
View File

@ -24,7 +24,6 @@ import (
"k8s.io/kubernetes/pkg/kubelet/network" "k8s.io/kubernetes/pkg/kubelet/network"
proberesults "k8s.io/kubernetes/pkg/kubelet/prober/results" proberesults "k8s.io/kubernetes/pkg/kubelet/prober/results"
kubetypes "k8s.io/kubernetes/pkg/kubelet/types" kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
"k8s.io/kubernetes/pkg/kubelet/util/cache"
"k8s.io/kubernetes/pkg/types" "k8s.io/kubernetes/pkg/types"
"k8s.io/kubernetes/pkg/util/flowcontrol" "k8s.io/kubernetes/pkg/util/flowcontrol"
"k8s.io/kubernetes/pkg/util/oom" "k8s.io/kubernetes/pkg/util/oom"
@ -53,9 +52,6 @@ func NewFakeDockerManager(
burst, containerLogsDir, osInterface, networkPlugin, runtimeHelper, httpClient, &NativeExecHandler{}, burst, containerLogsDir, osInterface, networkPlugin, runtimeHelper, httpClient, &NativeExecHandler{},
fakeOOMAdjuster, fakeProcFs, false, imageBackOff, false, false, true) fakeOOMAdjuster, fakeProcFs, false, imageBackOff, false, false, true)
dm.dockerPuller = &FakeDockerPuller{} dm.dockerPuller = &FakeDockerPuller{}
dm.versionCache = cache.NewVersionCache(func() (kubecontainer.Version, kubecontainer.Version, error) {
return dm.getVersionInfo()
})
return dm return dm
} }

24
pkg/kubelet/dockertools/manager.go
View File

@ -257,15 +257,6 @@ func NewDockerManager(
optf(dm) optf(dm)
} }
// initialize versionCache with a updater
dm.versionCache = cache.NewVersionCache(func() (kubecontainer.Version, kubecontainer.Version, error) {
return dm.getVersionInfo()
})
// update version cache periodically.
if dm.machineInfo != nil {
dm.versionCache.UpdateCachePeriodly(dm.machineInfo.MachineID)
}
return dm return dm
} }
@ -1592,26 +1583,13 @@ func (dm *DockerManager) calculateOomScoreAdj(container *api.Container) int {
return oomScoreAdj return oomScoreAdj
} }
// getCachedVersionInfo gets cached version info of docker runtime.
func (dm *DockerManager) getCachedVersionInfo() (kubecontainer.Version, kubecontainer.Version, error) {
apiVersion, daemonVersion, err := dm.versionCache.Get(dm.machineInfo.MachineID)
if err != nil {
glog.Errorf("Failed to get cached docker api version %v ", err)
}
// If we got nil versions, try to update version info.
if apiVersion == nil || daemonVersion == nil {
dm.versionCache.Update(dm.machineInfo.MachineID)
}
return apiVersion, daemonVersion, err
}
// checkDockerAPIVersion checks current docker API version against expected version. // checkDockerAPIVersion checks current docker API version against expected version.
// Return: // Return:
// 1 : newer than expected version // 1 : newer than expected version
// -1: older than expected version // -1: older than expected version
// 0 : same version // 0 : same version
func (dm *DockerManager) checkDockerAPIVersion(expectedVersion string) (int, error) { func (dm *DockerManager) checkDockerAPIVersion(expectedVersion string) (int, error) {
apiVersion, _, err := dm.getCachedVersionInfo() apiVersion, _, err := dm.getVersionInfo()
if err != nil { if err != nil {
return 0, err return 0, err
} }