Add hack for Docker cgroups #22757
Merged
Add hack for Docker cgroups #22757
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
jasontedor
added
:Data Management/Stats
|
Also, I should point out that I built a new Docker image from a SNAPSHOT build of Elasticsearch with this fix, and I was able to obtain the expected cgroup stats. |
Docker cgroups are mounted in the wrong place (i.e., inconsistently with /proc/self/cgroup). This commit adds an undocumented hack for working around, for now.
jasontedor
force-pushed
the
docker-cgroups-hack
branch
from
b77482e to
1401bef
Compare
rjernst
approved these changes
Jan 24, 2017
| @@ -191,6 +191,11 @@ private String readSingleLine(final Path path) throws IOException { | |||
| // pattern for lines in /proc/self/cgroup | |||
| private static final Pattern CONTROL_GROUP_PATTERN = Pattern.compile("\\d+:([^:,]+(?:,[^:,]+)?):(/.*)"); | |||
|
|
|||
| // this property is to support a hack to workaround an issue with Docker containers not mounting the cgroups hierarchy inconsistently | |||
There was a problem hiding this comment.
should this be "not mounting...consistently" or "mounting...inconsistently"? But I would think not the current double negative.
There was a problem hiding this comment.
Yes, I'll fix in the morning before merging.
| // this property is to support a hack to workaround an issue with Docker containers not mounting the cgroups hierarchy inconsistently | ||
| // with respect to /proc/self/cgroup; for Docker containers this should be set to "/" | ||
| private static final String CONTROL_GROUPS_PATH_OVERRRIDE = | ||
| (String) BootstrapInfo.getSystemProperties().get("es.cgroups.path.override"); |
There was a problem hiding this comment.
This can just be System.getProperty? I thought the point of BootstrapInfo.getSystemProperties() was when you wanted to call System.getProperties() (which we have in forbidden apis)
There was a problem hiding this comment.
You're right, I'll change.
This commit cleans up a few issues with the cgroups hierarchy hack: - renames the property from es.cgroups.path.override to es.cgroups.hierarchy.override - fixes a double negative in a comment - just uses System#getProperty instead of BootstrapInfo#getSystemProperties
|
@elasticmachine test this please |
thanks for verifying. it's hard to test I guess... I wonder if we should port this to 5.1.x - but I might be mistaking that this exists already in 5.1.x.. not sure |
+1, I'll port to 5.1 as well (you're not mistaken). |
|
retest this please |
jasontedor
added a commit
that referenced
this pull request
Jan 24, 2017
Docker cgroups are mounted in the wrong place (i.e., inconsistently with /proc/self/cgroup). This commit adds an undocumented hack for working around, for now. Relates #22757
jasontedor
added a commit
that referenced
this pull request
Jan 24, 2017
Docker cgroups are mounted in the wrong place (i.e., inconsistently with /proc/self/cgroup). This commit adds an undocumented hack for working around, for now. Relates #22757
jasontedor
added a commit
that referenced
this pull request
Jan 24, 2017
Docker cgroups are mounted in the wrong place (i.e., inconsistently with /proc/self/cgroup). This commit adds an undocumented hack for working around, for now. Relates #22757
dliappis
reviewed
Jan 25, 2017
| controllerMap.put(controller, matcher.group(2)); | ||
| if (CONTROL_GROUPS_HIERARCHY_OVERRIDE != null) { | ||
| /* | ||
| * Docker violates the relationship between /proc/self/cgroups and the /sys/fs/cgroup hierarchy. It's possible that this |
There was a problem hiding this comment.
@jasontedor Very minor typo, but should be /proc/self/cgroup
dliappis
pushed a commit
to elastic/elasticsearch-docker
that referenced
this pull request
Jan 25, 2017
Docker mounts cgroup stats inconsistently with the hierarchy in /proc/self/cgroup. This breaks the logic for traversing from /proc/self/cgroup to the stats for a process running inside a container. In core Elasticsearch, an undocumented hack was added to support this, for now. Thus, for cgroup stats to be available from Elasticsearch running inside a Docker container, the Elasticsearch process should be started with `-Des.cgroups.hierarchy.override=/`. Add hack for obtaining cgroup stats and comment it. Relates #25 Relates elastic/elasticsearch#22757
dliappis
pushed a commit
to elastic/elasticsearch-docker
that referenced
this pull request
Jan 26, 2017
Docker mounts cgroup stats inconsistently with the hierarchy in /proc/self/cgroup. This breaks the logic for traversing from /proc/self/cgroup to the stats for a process running inside a container. In core Elasticsearch, an undocumented hack was added to support this, for now. Thus, for cgroup stats to be available from Elasticsearch running inside a Docker container, the Elasticsearch process should be started with `-Des.cgroups.hierarchy.override=/`. Add hack for obtaining cgroup stats and comment it. Relates #25 Relates elastic/elasticsearch#22757
dliappis
pushed a commit
to elastic/elasticsearch-docker
that referenced
this pull request
Jan 26, 2017
Docker mounts cgroup stats inconsistently with the hierarchy in /proc/self/cgroup. This breaks the logic for traversing from /proc/self/cgroup to the stats for a process running inside a container. In core Elasticsearch, an undocumented hack was added to support this, for now. Thus, for cgroup stats to be available from Elasticsearch running inside a Docker container, the Elasticsearch process should be started with `-Des.cgroups.hierarchy.override=/`. Add hack for obtaining cgroup stats and comment it. Relates #25 Relates elastic/elasticsearch#22757
Merged
4 tasks
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.
Docker cgroups are mounted in the wrong place (i.e., inconsistently with /proc/self/cgroup). This commit adds an undocumented hack for working around, for now.
Relates #21029