This repository was archived by the owner on Feb 8, 2021. It is now read-only.
Enable pod support #572
Merged
Enable pod support #572
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
610282c to
4fc542b
Compare
6121774 to
fc950c4
Compare
cf04158 to
cee61ca
Compare
|
Please modify your commit message to describe more about this modifcations, also remove "cherry-pick from cfd4695 and 81d42e4", 81d42e4 isn't included in these codes and is outdated so you don't need to mention it. @ZhaoXuqiang |
cee61ca to
44ec27e
Compare
share a pod with existing container, with `--net container:xxx` get shared container by compare pid with exist running container's Pid which found from container's state file Signed-off-by: Zhang Wei <[email protected]> Signed-off-by: ZhaoXuqiang <[email protected]>
WeiZhang555
reviewed
Aug 26, 2017
| if err != nil { | ||
| return fmt.Errorf("The container %q is not ready", sharedContainer) | ||
| if sharedContainer, err = findSharedContainer(context.GlobalString("root"), ns.Path); err != nil { | ||
| return fmt.Errorf("failed to find shared container: %v", err) |
There was a problem hiding this comment.
Can you keep
- _, err = os.Stat(filepath.Join(root, sharedContainer, stateJSON))
- if err != nil {
- return fmt.Errorf("The container %q is not existing or not ready", sharedContainer)
- }
- _, err = os.Stat(filepath.Join(root, sharedContainer, "namespace"))
- if err != nil {
- return fmt.Errorf("The container %q is not ready", sharedContainer)
This piece of code is used for validation, I think it's still useful.
There was a problem hiding this comment.
I think it's not useful.
if sharedContainer != "" {
scState, err = loadStateFile(root, sharedContainer)
if err != nil {
return err
}
vm, lockFile, err = getSandbox(filepath.Join(context.GlobalString("root"), sharedContainer, "sandbox"))
if err != nil {
return err
}
}
func loadStateFile(root, container string) (*State, error) {
stateFile := filepath.Join(root, container, stateJSON)
file, err := os.Open(stateFile)
if err != nil {
return nil, err
}
defer file.Close()
var state State
if err = json.NewDecoder(file).Decode(&state); err != nil {
return nil, fmt.Errorf("Decode state file %s error: %s", stateFile, err.Error())
}
return &state, nil
}
loadStateFile will confirm the state file exist.
namespace file is not used.
There was a problem hiding this comment.
Looks like it's OK then.
ping @laijs
|
LGTM |
jimoosciuc
pushed a commit
to jimoosciuc/runv
that referenced
this pull request
May 26, 2020
Enable pod support
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 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.
share a pod with existing container, with
--net container:xxxget shared container by compare pid with exist running container's Pid which found from container's state file
Signed-off-by: Zhang Wei [email protected]
Signed-off-by: ZhaoXuqiang [email protected]