From 12b382ce760243d3b79b4069d503ac4f2dd5fc64 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Thu, 9 Apr 2015 14:31:44 -0700 Subject: [PATCH] kubelet/fake_docker_client: Use self's PID instead of 42 in testing. This is safer to use self's PID than some arbitrary PID (say 42), since the kubelet will set the oom_score_adj for real. --- pkg/kubelet/dockertools/fake_docker_client.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/dockertools/fake_docker_client.go b/pkg/kubelet/dockertools/fake_docker_client.go index cdbb5646191..3298baea279 100644 --- a/pkg/kubelet/dockertools/fake_docker_client.go +++ b/pkg/kubelet/dockertools/fake_docker_client.go @@ -18,6 +18,7 @@ package dockertools import ( "fmt" + "os" "reflect" "sort" "sync" @@ -180,7 +181,7 @@ func (f *FakeDockerClient) StartContainer(id string, hostConfig *docker.HostConf HostConfig: hostConfig, State: docker.State{ Running: true, - Pid: 42, + Pid: os.Getpid(), }, NetworkSettings: &docker.NetworkSettings{IPAddress: "1.2.3.4"}, }