Codestin Search App

timstclair · 2016-11-10T01:36:55Z

Verified manually, but I didn't have time to run all the e2e's yet (will check it in the morning).

This should be cherry-picked into 1.4, and merged into 1.5 (/cc @saad-ali )

Fix fetching pids running in a cgroup, which caused problems with OOM score adjustments & setting the /system cgroup ("misc" in the summary API).

/cc @kubernetes/sig-node

This change is

saad-ali · 2016-11-10T01:42:43Z

This should be cherry-picked into 1.4, and merged into 1.5 (/cc @saad-ali )

Ack. Bug fix ok for post-code freeze merge.

CC @jessfraz for 1.4 cherry pick

jessfraz · 2016-11-10T01:43:21Z

awesome!!

feiskyer · 2016-11-10T07:06:20Z

+			return ensureSystemCgroups("/", manager)
 		}
 		systemContainers = append(systemContainers, cont)
+	} else {


remove this else block?

Oops! Thanks, done.

feiskyer · 2016-11-10T07:08:49Z

+	return libcontainercgroups.GetPids(dir)
+}
+
+func getCgroupPath(cgroupPath string) (string, error) {


nit: add documents for getCgroupPath and getCgroupParentPath

vishh · 2016-11-10T15:00:06Z

@@ -0,0 +1,73 @@
+/*


nit: I'd prefer cgroups logic to be contained inside pkg/kubelet/cm/

That creates a circular dependency, since pkg/kubelet/cm/ depends on pkg/util/oom

@timstclair will a sub-package of cm work? Having all cgroups logic in there will help with code structure.

Sure, I don't have a strong opinion on where the package is.

vishh · 2016-11-10T15:01:52Z

+			return ensureSystemCgroups("/", manager)
 		}
 		systemContainers = append(systemContainers, cont)
+	} else {


k8s-ci-robot · 2016-11-10T18:00:03Z

Jenkins GCE e2e failed for commit 585673fb55b4522bcece6fce283876e8de2d393d. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gce e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

k8s-ci-robot · 2016-11-10T18:00:03Z

Jenkins GCI GCE e2e failed for commit 585673fb55b4522bcece6fce283876e8de2d393d. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gce e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

k8s-ci-robot · 2016-11-10T18:00:03Z

Jenkins GCE etcd3 e2e failed for commit 585673fb55b4522bcece6fce283876e8de2d393d. Full PR test history.

The magic incantation to run this job again is @k8s-bot gce etcd3 e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

k8s-ci-robot · 2016-11-10T18:00:04Z

Jenkins GCI GKE smoke e2e failed for commit 585673fb55b4522bcece6fce283876e8de2d393d. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

k8s-ci-robot · 2016-11-10T18:00:34Z

Jenkins GKE smoke e2e failed for commit 585673fb55b4522bcece6fce283876e8de2d393d. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

k8s-ci-robot · 2016-11-10T18:01:03Z

Jenkins Kubemark GCE e2e failed for commit 585673fb55b4522bcece6fce283876e8de2d393d. Full PR test history.

The magic incantation to run this job again is @k8s-bot kubemark e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

k8s-ci-robot · 2016-11-10T18:01:34Z

Jenkins GCE Node e2e failed for commit 585673fb55b4522bcece6fce283876e8de2d393d. Full PR test history.

The magic incantation to run this job again is @k8s-bot node e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

k8s-ci-robot · 2016-11-10T18:30:32Z

Jenkins verification failed for commit a2f18e6. Full PR test history.

The magic incantation to run this job again is @k8s-bot verify test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

timstclair · 2016-11-10T19:06:32Z

Verified OOM tests pass on all images with this fix.

k8s-ci-robot · 2016-11-10T19:22:57Z

Jenkins unit/integration failed for commit e58108b. Full PR test history.

The magic incantation to run this job again is @k8s-bot unit test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

timstclair · 2016-11-10T21:09:52Z

Squashed commits. I kept the BUILD files in a separate commit for easier cherry-picking to 1.4. Reapplying LGTM.

jessfraz · 2016-11-10T21:10:37Z

thanks!

k8s-github-robot · 2016-11-10T22:12:53Z

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

k8s-github-robot · 2016-11-10T22:50:11Z

Automatic merge from submit-queue

Automatic merge from submit-queue Fix getting cgroup pids Cherry-pick from #36551 Targetting v1.4.6 ```release-note Fix fetching pids running in a cgroup, which caused problems with OOM score adjustments & setting the /system cgroup ("misc" in the summary API). ```

Automatic merge from submit-queue Fix getting cgroup pids Cherry-pick from kubernetes#36551 Targetting v1.4.6 ```release-note Fix fetching pids running in a cgroup, which caused problems with OOM score adjustments & setting the /system cgroup ("misc" in the summary API). ```

timstclair added cherrypick-candidate priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Nov 10, 2016

timstclair added this to the v1.4 milestone Nov 10, 2016

timstclair assigned jessfraz and vishh Nov 10, 2016

googlebot added the cla: yes label Nov 10, 2016

jessfraz added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Nov 10, 2016

k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 10, 2016

feiskyer reviewed Nov 10, 2016

View reviewed changes

vishh reviewed Nov 10, 2016

View reviewed changes

timstclair force-pushed the cvm-system branch from 585673f to a2f18e6 Compare November 10, 2016 18:01

vishh approved these changes Nov 10, 2016

View reviewed changes

vishh added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 10, 2016

tallclair added 2 commits November 10, 2016 13:08

Fix getting cgroup pids

cb588e8

BUILD changes for cgroup pids

3aaa6fc

timstclair force-pushed the cvm-system branch from e58108b to 3aaa6fc Compare November 10, 2016 21:08

timstclair added lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Nov 10, 2016

k8s-github-robot merged commit 89ebb2a into kubernetes:master Nov 10, 2016

This was referenced Nov 10, 2016

Fix getting cgroup pids #36614

Merged

[k8s.io] Kubelet Container Manager [Serial] Validate OOM score adjustments once the node is setup pod infra containers oom-score-adj should be -998 and best effort container's should be 1000 {E2eNode Suite} #33232

Closed

jessfraz removed the cherrypick-candidate label Nov 11, 2016

chentao1596 mentioned this pull request Dec 5, 2016

WIP:kubelet: support multi-headers when getting pod from HTTP source #38089

Closed

Conversation

timstclair commented Nov 10, 2016 • edited by k8s-oncall Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

saad-ali commented Nov 10, 2016

Uh oh!

jessfraz commented Nov 10, 2016

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented Nov 10, 2016

Uh oh!

k8s-ci-robot commented Nov 10, 2016

Uh oh!

k8s-ci-robot commented Nov 10, 2016

Uh oh!

k8s-ci-robot commented Nov 10, 2016

Uh oh!

k8s-ci-robot commented Nov 10, 2016

Uh oh!

k8s-ci-robot commented Nov 10, 2016

Uh oh!

k8s-ci-robot commented Nov 10, 2016

Uh oh!

k8s-ci-robot commented Nov 10, 2016

Uh oh!

timstclair commented Nov 10, 2016

Uh oh!

k8s-ci-robot commented Nov 10, 2016

Uh oh!

timstclair commented Nov 10, 2016

Uh oh!

jessfraz commented Nov 10, 2016

Uh oh!

k8s-github-robot commented Nov 10, 2016

Uh oh!

k8s-github-robot commented Nov 10, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

timstclair commented Nov 10, 2016 •

edited by k8s-oncall

Loading