This repository was archived by the owner on Feb 24, 2020. It is now read-only.
rkt/app: multiple bugfixes #3405
Merged
Conversation
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
s-urbaniak
suggested changes
Nov 23, 2016
| @@ -388,17 +383,17 @@ func RmApp(cfg RmConfig) error { | |||
| } | |||
| } | |||
|
|
|||
| if err := RunCrossingEntrypoint(cfg.PodPath, cfg.PodPID, cfg.AppName.String(), appRmEntrypoint, args); err != nil { | |||
| if err := RunCrossingEntrypoint(cfg.PodPath, cfg.PodPID, cfg.AppName.String(), appRmEntrypoint, args, false); err != nil { | |||
There was a problem hiding this comment.
we are starting to accumulate more, and more parameters. How about introducing a:
type CrossingEntryPoint struct {
PodPath string
PodPID string
AppName string
RmEntrypoint string
Interactive bool
}
and have the following method:
func (cep CrossingEntryPoint) Run() error {
...
}
The caller would instantiate a struct using obvious named values, and invoke the Run() method.
| flavor, _, err := stage1initcommon.GetFlavor(p) | ||
| if err != nil { | ||
| log.PrintE("failed to get stage1 flavor", err) | ||
| os.Exit(254) |
There was a problem hiding this comment.
doesn't our logger exit with 254, when using log.FatalE?
There was a problem hiding this comment.
It does, it looks like we can get rid of all those explicit Exit().
| if err != nil { | ||
| log.FatalE("error getting cgroups", err) | ||
| log.PrintE(`error preparing cgroups`, err) | ||
| os.Exit(254) |
There was a problem hiding this comment.
same as above, log.FatalE doesn't exit with 254 already?
There was a problem hiding this comment.
I have to double-check, as I don't exactly remember what was going on here.
| if !isUnified { | ||
| enabledCgroups, err := v1.GetEnabledCgroups() | ||
| // when using host cgroups, make the subgroup writable by pod systemd | ||
| if flavor != "kvm" { |
| @@ -165,10 +156,39 @@ func main() { | |||
| Args: args, | |||
| } | |||
|
|
|||
| if err := cmd.Run(); err != nil { | |||
| log.PrintE(`error executing "systemctl daemon-reload"`, err) | |||
| if out, err := cmd.CombinedOutput(); err != nil { | |||
| if err := cmd.Run(); err != nil { | ||
| log.PrintE(`error executing "systemctl daemon-reload"`, err) | ||
| if out, err := cmd.CombinedOutput(); err != nil { | ||
| log.Error(fmt.Errorf("%q failed at daemon-reload:\n%s", appName, out)) |
| return errwrap.Wrap(errors.New("failed to determine cgroup version"), err) | ||
| } | ||
|
|
||
| if !isUnified { |
There was a problem hiding this comment.
if isUnified {
return nil
}
then untab the inner block
| log.PrintE(`error executing "systemctl daemon-reload"`, err) | ||
|
|
||
| if out, err := cmd.CombinedOutput(); err != nil { | ||
| log.Error(fmt.Errorf("%q failed at daemon-reload:\n%s", appName, out)) | ||
| os.Exit(254) |
| if err := cmd.Run(); err != nil { | ||
| log.PrintE(fmt.Sprintf("error starting app %q", appName.String()), err) | ||
| if out, err := cmd.CombinedOutput(); err != nil { | ||
| log.Error(fmt.Errorf("%q failed:\n%s", appName, out)) | ||
| os.Exit(254) |
This add `Errorf()`, `Fatalf()` and `Panicf()` as convience helpers to format and print string errors.
This fixes an incorrect behavior regarding cgroups remounting. When running inside a kvm pod app-add should not try to tweak host cgroups, as the pod already gets a dedicated and writable cgroup hierarchy inside the VM.
This commit adds a `/etc/mtab -> ../proc/self/mounts` symlink in stage1 in oder to make mount and other tools happy.
a3fd941 to
24bbe1f
Compare
|
Added a couple more commits to cleanup a few other bits after review comments. @s-urbaniak PTAL. |
|
LGTM, nice to have the 254 exits consolidated! |
s-urbaniak
approved these changes
Nov 24, 2016
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.
This is a cumulative PR containing multiple fixes for
rkt appthat surfaced while writing tests at #3371. Tests are not yet green, but these fixes should be ready to get in.