Fix cgroup name mismatches and add missing services #4165
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
deitch
approved these changes
Aug 27, 2024
christoph-zededa
approved these changes
Aug 27, 2024
| @@ -9,7 +9,7 @@ hv=`cat /run/eve-hv-type` | |||
| default_cgroup_cpus_limit=1 | |||
|
|
|||
| default_cgroup_memory_limit=838860800 #800M | |||
| EVESERVICES="sshd edgeview wwan wlan lisp guacd pillar vtpm watchdog xen-tools newlogd memlogd" | |||
| EVESERVICES="sshd eve-edgeview wwan wlan lisp guacd pillar vtpm watchdog xen-tools newlogd memlogd memory-monitor debug" | |||
There was a problem hiding this comment.
Should we unify cgroup names and avoid the eve- prefix which no other service is using?
CC @naiming-zededa
There was a problem hiding this comment.
Yeah, it would be nicer, but changing only one file is simpler =)
eriknordmark
approved these changes
Aug 28, 2024
Good point. I think, yes, it should. I'll create backport PRs later today. |
rouming
reviewed
Aug 28, 2024
| @@ -9,7 +9,7 @@ hv=`cat /run/eve-hv-type` | |||
| default_cgroup_cpus_limit=1 | |||
|
|
|||
| default_cgroup_memory_limit=838860800 #800M | |||
| EVESERVICES="sshd edgeview wwan wlan lisp guacd pillar vtpm watchdog xen-tools newlogd memlogd" | |||
| EVESERVICES="sshd eve-edgeview wwan wlan lisp guacd pillar vtpm watchdog xen-tools newlogd memlogd" | |||
There was a problem hiding this comment.
Please don't forget to reflect changed directory output in your own documentation: ./pkg/memory-monitor/README.md:18
There was a problem hiding this comment.
Do you mean the example of the cgroups hierarchy?
The EdgeView service is integrated into EVE OS with the name "eve-edgeview". It is set to use the corresponding cgroup name. Hence fix the cgroup path in the cgroup setting script. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>
Added `memory-monitor` to the `EVESERVICES` list in the `010-eve-cgroup` initialization script. This way the regular eve cgroup memory limit will be applied to it. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>
Added `debug` to the `EVESERVICES` list in the `010-eve-cgroup` initialization script. This way the regular eve cgroup memory limit will be applied to it. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>
OhmSpectator
force-pushed
the
fix/fix-cgroups-for-services
branch
from
ba7fcc2
to
def9446
Compare
github-actions
bot
requested review from
christoph-zededa,
eriknordmark and
rouming
…up limits. Added comments to explain memory limits for containerd and services cgroups. Simplified the list of services under the "services" cgroup. Signed-off-by: Nikolay Martyanov <nikolay@zededa.com>
OhmSpectator
force-pushed
the
fix/fix-cgroups-for-services
branch
from
def9446
to
2f104b2
Compare
|
The tests were green before I updated a README file. So, I should not be affected. Mergeing to crate backport PRs. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR addresses discrepancies between cgroup names used in the 010-eve-cgroup initialization script and the service configuration files. These mismatches have led to certain memory limits not being applied correctly to specific services. The changes included in this PR ensure consistency across service names in the cgroup settings and service configurations, thereby fixing the memory limit application issue.
There were three main issues identified: