-
Notifications
You must be signed in to change notification settings - Fork 235
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow overriding the default /proc folder in blkioController #97
Conversation
A host may share its /proc FS folder with a privileged container, mounted in an alternative folder (e.g. /host/proc), as some users prefer to run their monitoring software inside a container instead of as a host process. This patch allows overriding the default /proc folder to allow the blkio Controller working inside containerized monitoring software. The /proc root can be overriden via an optional function (ProcRoot) to avoid introducing a new NewBlkio constructor or introducing breaking changes in the current API. Then, the NewBlkio constructor can be invoked as usual, or in the following form, to override the /proc path: ctrl := NewBlkio("/sys/fs/cgroup", ProcRoot("/host/proc")) Signed-off-by: Mario Macias <mariomac@gmail.com>
Codecov Report
@@ Coverage Diff @@
## master #97 +/- ##
==========================================
+ Coverage 41.76% 42.02% +0.25%
==========================================
Files 23 23
Lines 1616 1623 +7
==========================================
+ Hits 675 682 +7
Misses 817 817
Partials 124 124
Continue to review full report at Codecov.
|
LGTM |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
full diff: containerd/cgroups@c4b9ac5...5fbad35 - containerd/cgroups#82 Add go module support - containerd/cgroups#96 Move metrics proto package to stats/v1 - containerd/cgroups#97 Allow overriding the default /proc folder in blkioController - containerd/cgroups#98 Allows ignoring memory modules - containerd/cgroups#99 Add Go 1.13 to Travis - containerd/cgroups#100 stats/v1: export per-cgroup stats Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: containerd/cgroups@c4b9ac5...5fbad35 - containerd/cgroups#82 Add go module support - containerd/cgroups#96 Move metrics proto package to stats/v1 - containerd/cgroups#97 Allow overriding the default /proc folder in blkioController - containerd/cgroups#98 Allows ignoring memory modules - containerd/cgroups#99 Add Go 1.13 to Travis - containerd/cgroups#100 stats/v1: export per-cgroup stats Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 27552ceb15bca544820229e574427d4c1d6ef585 Component: engine
full diff: containerd/cgroups@c4b9ac5...5fbad35 - containerd/cgroups#82 Add go module support - containerd/cgroups#96 Move metrics proto package to stats/v1 - containerd/cgroups#97 Allow overriding the default /proc folder in blkioController - containerd/cgroups#98 Allows ignoring memory modules - containerd/cgroups#99 Add Go 1.13 to Travis - containerd/cgroups#100 stats/v1: export per-cgroup stats Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 27552ce) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: containerd/cgroups@c4b9ac5...5fbad35 - containerd/cgroups#82 Add go module support - containerd/cgroups#96 Move metrics proto package to stats/v1 - containerd/cgroups#97 Allow overriding the default /proc folder in blkioController - containerd/cgroups#98 Allows ignoring memory modules - containerd/cgroups#99 Add Go 1.13 to Travis - containerd/cgroups#100 stats/v1: export per-cgroup stats Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 27552ceb15bca544820229e574427d4c1d6ef585) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 9ab162a73ac9e133a21cffbadd3339cbb5213939 Component: engine
A host may share its
/proc
FS folder with a privileged container, mounted in analternative folder (e.g.
/host/proc
), as some users prefer to run theirmonitoring software inside a container rather than a host process.
This patch allows overriding the default
/proc
folder to allow the blkioController working inside containerized monitoring software.
The
/proc
root can be overriden via an optional function (ProcRoot
) toavoid introducing a new
NewBlkio
constructor or introducing breaking changesin the current API.
Then, the
NewBlkio
constructor can be invoked as usual, or in the followingform, to override the /proc path: