This repository has been archived by the owner on Feb 24, 2020. It is now read-only.
lib/app: check in upper/ if the pod uses overlay #3791
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
Getting creation/start time and status of applications will fail for pods using overlay if stage1 was unmounted (e.g. when rebooting). This commit checks in the `upper/` directory if the pod uses overlay.
nhlfr
approved these changes
Sep 8, 2017
alban
reviewed
Sep 11, 2017
lib/app.go
Outdated
| appStatusesPath := filepath.Join(upper, "/rkt/status") | ||
|
|
||
| createdFile = filepath.Join(appStatusesPath, fmt.Sprintf("%s-created", app.Name)) | ||
| startedFile = filepath.Join(appStatusesPath, fmt.Sprintf("%s-started", app.Name)) |
There was a problem hiding this comment.
I would prefer if it was:
createdFile := common.AppCreatedPathOverlay(pod, app.Name)
startedFile := common.AppStartedPathOverlay(pod, app.Name)
appStatusFile := common.AppStatusPathOverlay(pod, app.Name)
And add those 3 new functions with a "Overlay" suffix in common/common.go.
Because at the moment, the way to build the flag filename (e.g. "%s-created") is spread over different Golang packages.
There was a problem hiding this comment.
I implemented a slightly different thing since we already had some logic for dealing with overlay in pods.go.
alban
approved these changes
Sep 13, 2017
There was a problem hiding this comment.
Confusing that there are two functions with the same name Stage1RootfsPath() and they have different behaviour:
common/common.go:101:func Stage1RootfsPath(root string) string {
pkg/pod/pods.go:1126:func (p *Pod) Stage1RootfsPath() (string, error) {
But it's unrelated to this PR.
LGTM.
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.
Getting creation/start time and status of applications will fail for
pods using overlay if stage1 was unmounted (e.g. when rebooting).
This commit checks in the
upper/directory if the pod uses overlay.