Point to the right cgroup root dir on Amazon Linux #880
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
|
|
xvello
suggested changes
Nov 30, 2017
There was a problem hiding this comment.
Let's be a bit more specific on the Stat.
Also, to ease support and debugging, we need to log what root was detected. Could we for example add a log.Warnf here
datadog-agent/pkg/util/docker/cgroup.go
Line 467 in 589e145
if we find zero mounts?
pkg/config/config.go
Outdated
| @@ -94,7 +94,12 @@ func init() { | |||
|
|
|||
| } else { | |||
| Datadog.SetDefault("container_proc_root", "/proc") | |||
| Datadog.SetDefault("container_cgroup_root", "/sys/fs/cgroup/") | |||
| // for amazon linux the cgroup directory on host is /cgroup/ | |||
| if _, err := os.Stat("/cgroup/"); err == nil { | |||
There was a problem hiding this comment.
Let's be more specific on the Stat and make sure we don't have an empty folder. We could look for /cgroup/memory/memory.stat for example
masci
changed the title
xvello
suggested changes
Nov 30, 2017
pkg/util/docker/cgroup.go
Outdated
| @@ -464,6 +464,7 @@ func parseCgroupMountPoints(r io.Reader) map[string]string { | |||
| } | |||
| } | |||
| } | |||
| log.Warnf("current cgroup root is: %s", cgroupRoot) | |||
There was a problem hiding this comment.
We should avoid log spam, I'd just log if we have an actual warning:
if len(mountPoints) == 0 {
log.Warnf("could not locate cgroup folders in %s, please check your configuration", cgroupRoot)
}
There was a problem hiding this comment.
Sorry I immediately realized that, change already made.
xvello
approved these changes
Nov 30, 2017
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.
What does this PR do?
For agents running on amazon linux, the cgroup mount directory is at
/cgroup/. This PR sets the variablecontainer_cgroup_rootto that as the default value.Motivation
Amazon linux.