This repository has been archived by the owner on Feb 24, 2020. It is now read-only.
rkt: return the pid of stage1 in "rkt status" #1699
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
Open
|
If we send SIGTERM to lkvm it exits with a failed exit status. |
| @@ -799,8 +799,17 @@ func getChildPID(ppid int) (int, error) { | |||
| return -1, ErrChildNotReady{} | |||
| } | |||
|
|
|||
| // getPID returns the pid of the pod. | |||
| func (p *pod) getPID() (pid int, err error) { | |||
| // getPID returns the pid of the rkt process that started the pod. | |||
There was a problem hiding this comment.
rkt process seems confusing. It's actually the nspawn or kvm process, right?
There was a problem hiding this comment.
Maybe the stage1 process? Also for the title of the PR?
There was a problem hiding this comment.
Well, the rkt process execs nspawn or kvm so in a way it is the rkt process. But you're right, stage1 process is better.
|
LGTM, except for the naming in the comments |
iaguis
changed the title
Instead of returning the PID of the process that's PID 1 inside the container, we return the pid of the stage1 process that started the pod. Users can, for example, terminate the pod by sending SIGTERM to that PID if the container was started with systemd-nspawn.
yifan-gu
added a commit
that referenced
this pull request
Nov 2, 2015
rkt: return the pid of stage1 in "rkt status"
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.
Instead of returning the PID of the process that's PID 1 inside the
container, we return the pid of the rkt process that started the pod.
Users can, for example, terminate the pod by sending SIGTERM to that PID
if the container was started with systemd-nspawn.