Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

revert: JoinControllers system.conf configuration #1095

Merged
merged 2 commits into from
Apr 18, 2019

Conversation

jackfrancis
Copy link
Member

@jackfrancis jackfrancis commented Apr 18, 2019

Reason for Change:

Reverts #605. Java does not like a joined cgroup configuration:

$ sudo ls -la /sys/fs/cgroup/
total 0
drwxr-xr-x 10 root root 340 Apr 18 20:06 .
drwxr-xr-x 10 root root   0 Apr 18 20:06 ..
dr-xr-xr-x  6 root root   0 Apr 18 20:06 blkio
lrwxrwxrwx  1 root root  50 Apr 18 20:06 cpu -> cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory
lrwxrwxrwx  1 root root  50 Apr 18 20:06 cpuacct -> cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory
dr-xr-xr-x  7 root root   0 Apr 18 20:06 cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory
lrwxrwxrwx  1 root root  50 Apr 18 20:06 cpuset -> cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory
dr-xr-xr-x  6 root root   0 Apr 18 20:06 devices
dr-xr-xr-x  3 root root   0 Apr 18 20:06 freezer
lrwxrwxrwx  1 root root  50 Apr 18 20:06 hugetlb -> cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory
lrwxrwxrwx  1 root root  50 Apr 18 20:06 memory -> cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory
lrwxrwxrwx  1 root root  50 Apr 18 20:06 net_cls -> cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory
lrwxrwxrwx  1 root root  50 Apr 18 20:06 net_prio -> cpu,cpuacct,cpuset,net_cls,net_prio,hugetlb,memory
dr-xr-xr-x  3 root root   0 Apr 18 20:06 perf_event
dr-xr-xr-x  6 root root   0 Apr 18 20:06 pids
dr-xr-xr-x  2 root root   0 Apr 18 20:06 rdma
dr-xr-xr-x  6 root root   0 Apr 18 20:06 systemd

Java tries to read the memory cgroup to understand what limits are set on it. Java does not currently understand the single hierarchy configuration this changed made and is unable to read the imposed memory limits, instead it falls back to just reading the system memory.

Issue Fixed:

Requirements:

Notes:

@acs-bot acs-bot added the size/S label Apr 18, 2019
@acs-bot
Copy link

acs-bot commented Apr 18, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Copy link
Member

@mboersma mboersma left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove parts/k8s/cloud-init/artifacts/system.conf as well?

Otherwise, lgtm.

@cpuguy83
Copy link
Member

cpuguy83 commented Apr 18, 2019

Can you update the commit message to include details on what java does not like and why java matters?
This makes it easier to understand later.

Basically, something like this:

Java tries to read the memory cgroup to understand what limits are set on it. Java does not currently understand the single hierarchy configuration this changed made and is unable to read the imposed memory limits, instead it falls back to just reading the system memory.

--- EDIT ---

s/java does not matter/java matters/

@jackfrancis
Copy link
Member Author

@mboersma yes, done

@cpuguy83 thanks, added

@codecov
Copy link

codecov bot commented Apr 18, 2019

Codecov Report

Merging #1095 into master will decrease coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #1095      +/-   ##
==========================================
- Coverage   74.33%   74.33%   -0.01%     
==========================================
  Files         131      131              
  Lines       18260    18259       -1     
==========================================
- Hits        13574    13573       -1     
  Misses       3905     3905              
  Partials      781      781

@mboersma
Copy link
Member

I think @cpuguy83 wanted to see that blurb in the actual commit message body. If we admin-merge or force-push, let's do add it there.

@jackfrancis jackfrancis merged commit eb52fde into Azure:master Apr 18, 2019
@jackfrancis jackfrancis deleted the revert-joincontrollers branch April 18, 2019 22:00
mboersma pushed a commit that referenced this pull request Apr 18, 2019
Java tries to read the memory cgroup to understand what limits are set on it. Java does not currently understand the single hierarchy configuration this changed made and is unable to read the imposed memory limits, instead it falls back to just reading the system memory.
mboersma pushed a commit to mboersma/aks-engine that referenced this pull request Apr 18, 2019
Java tries to read the memory cgroup to understand what limits are set on it. Java does not currently understand the single hierarchy configuration this changed made and is unable to read the imposed memory limits, instead it falls back to just reading the system memory.
jackfrancis added a commit to jackfrancis/aks-engine that referenced this pull request Apr 23, 2019
Java tries to read the memory cgroup to understand what limits are set on it. Java does not currently understand the single hierarchy configuration this changed made and is unable to read the imposed memory limits, instead it falls back to just reading the system memory.
# Conflicts:
#	parts/k8s/kubernetesagentcustomdata.yml
#	parts/k8s/kubernetesmastercustomdata.yml
#	parts/k8s/system.conf
#	pkg/engine/armvariables.go
#	pkg/engine/armvariables_test.go
#	pkg/engine/const.go
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants