Fix name resolution in Systemd systems #220
Conversation
|
This is why Docker containers were not being registered in Systemd systems. It is still broken now because of a bug in libcontainer. Looking into that. It is actually broken even worse now because we'll register the Docker driver, but can't get stats from it. Maybe hold off merging until I figure out the libcontainer issue :) |
|
@vmarmol Is it safe to merge this PR now? |
|
@vishh not yet, we still have the libcontainer issues. |
|
@rjnagal @vishh PTAL. I made us always use the FS stats API even in systemd systems which makes this work. I already sent a PR to libcontainer, I'll update when that goes through. Fixes #143 Only remaining issue is that the "system.slice" does not show the docker container name. One at a time :) all the exported stats and names should work, so it is only a UI issue at this point. |
|
Ping :D |
|
|
||
| // Turn systemd cgroup name into Docker ID. | ||
| if useSystemd { | ||
| const systemdDockerPrefix = "docker-" |
There was a problem hiding this comment.
Should we instead export "docker-" prefix from libcontainer?
There was a problem hiding this comment.
libcontainer as in container/libcontainer/helpers.go?
I think the right place for this is here since it is a Docker concept and not a libcontainer one (as in, Docker prefixes it's containers with that).
There was a problem hiding this comment.
I meant docker/libcontainer. If libcontainer is not the source of the prefix, then the current code is fine as is.
There was a problem hiding this comment.
libcontainer does some sad mangling of container names I'm trying to remove in a PR :( once that goes in, Docker will be the one doing the prefixing.
|
LGTM |
Fix name resolution in Systemd systems
No description provided.