Allow overriding the default /proc folder in blkioController#97
Merged
estesp merged 1 commit intocontainerd:masterfrom Sep 23, 2019
mariomac:master
Merged
Allow overriding the default /proc folder in blkioController#97estesp merged 1 commit intocontainerd:masterfrom mariomac:master
estesp merged 1 commit intocontainerd:masterfrom
mariomac:master
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 <[email protected]>
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.
|
Member
|
LGTM |
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Oct 31, 2019
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 <[email protected]>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Oct 31, 2019
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 <[email protected]> Upstream-commit: 27552ceb15bca544820229e574427d4c1d6ef585 Component: engine
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Dec 3, 2019
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 <[email protected]> (cherry picked from commit 27552ce) Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Jan 23, 2020
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 <[email protected]> (cherry picked from commit 27552ceb15bca544820229e574427d4c1d6ef585) Signed-off-by: Sebastiaan van Stijn <[email protected]> Upstream-commit: 9ab162a73ac9e133a21cffbadd3339cbb5213939 Component: engine
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
A host may share its
/procFS 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
/procfolder to allow the blkioController working inside containerized monitoring software.
The
/procroot can be overriden via an optional function (ProcRoot) toavoid introducing a new
NewBlkioconstructor or introducing breaking changesin the current API.
Then, the
NewBlkioconstructor can be invoked as usual, or in the followingform, to override the /proc path: