Update state after update #1558
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
state.json should be a reflection of the container's realtime state, including resource configurations, so we should update state.json after updating container resources. Signed-off-by: Qiang Huang <[email protected]>
|
LGTM |
1 similar comment
|
LGTM |
kolyshkin
reviewed
Feb 2, 2021
| @@ -186,8 +186,17 @@ func (c *linuxContainer) Set(config configs.Config) error { | |||
| if status == Stopped { | |||
| return newGenericError(fmt.Errorf("container not running"), ContainerNotRunning) | |||
| } | |||
| if err := c.cgroupManager.Set(&config); err != nil { | |||
| // Set configs back | |||
| if err2 := c.cgroupManager.Set(c.config); err2 != nil { | |||
There was a problem hiding this comment.
I am not sure about external users of libcontainer, but runc's own update.go modifies container config in place, meaning &config and c.config is exactly the same thing, meaning this "rollback" does not make sense.
@hqhq do you remember why you introduced it?
There was a problem hiding this comment.
@kolyshkin Libcontainer was supposed to be used without runc, so the config parameter can be different from c.config, if I remember right, before I added runc update, docker was using this Set function of libcontainer directly for docker update, this rollback was valid at that time.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
state.json should be a reflection of the container's
realtime state, including resource configurations,
so we should update state.json after updating container
resources.
Signed-off-by: Qiang Huang [email protected]