rkt: create parent cgroup to enable stats #4188
Merged
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
Having the Nomad executor create parent cgroups that rkt is launched within allows the stats collection code used for the exec driver to Just Work. The only downside is that now the Nomad executor's resource utilization counts against the cgroups resource limits just as it does for the exec driver.
dadgar
requested changes
Apr 20, 2018
| @@ -194,7 +194,10 @@ func rktGetDriverNetwork(uuid string, driverConfigPortMap map[string]string, log | |||
| return nil, lastErr | |||
| } | |||
|
|
|||
| // This is a successful landing. | |||
| // This is a successful landing; log if its not the first attempt. | |||
There was a problem hiding this comment.
Is there a test we can add to ensure stats work?
|
Added a test and modernized rkt tests a bit more. Also removed the env var required to run them as we already require Linux + root + rkt installed. Since it's an officially supported driver we probably shouldn't skip the tests by default. |
dadgar
approved these changes
Apr 24, 2018
client/testutil/driver_compatible.go
Outdated
| func RktCompatible(t *testing.T) { | ||
| if runtime.GOOS == "windows" || syscall.Geteuid() != 0 { | ||
| t.Skip("Must be root on non-windows environments to run test") | ||
| t.Skip("Must be root on non-Windows environments to run test") |
There was a problem hiding this comment.
This would also try on Darwin
client/testutil/driver_compatible.go
Outdated
| rktOnce.Do(func() { | ||
| out, err := exec.Command("rkt", "version").CombinedOutput() | ||
| if err == nil { | ||
| t.Logf("found rkt version: %s", out) |
Remove the NOMAD_TEST_RKT flag as a guard for rkt tests. Still require Linux, root, and rkt to be installed. Only check for rkt installation once in hopes of speeding up rkt tests a bit.
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes #2400
Having the Nomad executor create parent cgroups that rkt is launched
within allows the stats collection code used for the exec driver to Just
Work. The only downside is that now the Nomad executor's resource
utilization counts against the cgroups resource limits just as it does
for the exec driver.