Merge pull request #59025 from ggaaooppeenngg/add-err-in-ensure-check

Automatic merge from submit-queue (batch tested with PRs 50724, 59025, 59710, 59404, 59958). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add detailed err in ensure docker process error Signed-off-by: Peng Gao <peng.gao.dut@gmail.com> **What this PR does / why we need it**: Add detailed error. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #59025 from ggaaooppeenngg/add-err-in-ensure-check
97b9271a · Kubernetes Submit Queue · GitHub · c1d58008 · ac86428d · 97b9271a
Unverified Commit 97b9271a authored Feb 26, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 26, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

container_manager_linux.go pkg/kubelet/dockershim/cm/container_manager_linux.go +1 -1

No files found.
--- a/pkg/kubelet/dockershim/cm/container_manager_linux.go
+++ b/pkg/kubelet/dockershim/cm/container_manager_linux.go
@@ -95,7 +95,7 @@ func (m *containerManager) doWork() {
 	//   1. Ensure processes run in the cgroups if m.cgroupsManager is not nil.
 	//   2. Ensure processes have the OOM score applied.
 	if err := kubecm.EnsureDockerInContainer(version, dockerOOMScoreAdj, m.cgroupsManager); err != nil {
-		glog.Errorf("Unable to ensure the docker processes run in the desired containers")
+		glog.Errorf("Unable to ensure the docker processes run in the desired containers: %v", err)
 	}
 }