oci-register-machine: Get hook stage from stdin's 'status' value #40
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
wking
force-pushed
the
stage-from-stdin
branch
from
0763b07 to
8a6626a
Compare
Instead of using CRI-O-specific arguments or environment variables, use the state's REQUIRED 'status' property [1] to ensure we're being called on a created container (and not a running container or a stopped container). I've shifted the order in the "Register machine" log entry as well, because the container ID seems more important than the stage/status. I've also shifted the "unsupported status" warning outside of the switch; it had been inside the poststop branch since it landed in 3e9549a (Make work with latest hooks patch, 2015-10-29, projectatomic#2). Go switches do not require braces around the per-case blocks [2], but that may have been the source of the misplacement. [1]: https://github.com/opencontainers/runtime-spec/blame/v1.0.1/runtime.md#L16 [2]: https://golang.org/ref/spec#Switch_statements
Member
|
Big question whether this works properly with docker-runc used for docker-1.12 and docker-1.13 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Instead of using CRI-O-specific arguments or environment variables, use the state's REQUIRED
statusproperty to ensure we're being called on a created container (and not a running container or a stopped container).I've shifted the order in the “Register machine” log entry as well, because the container ID seems more important than the stage/status.
I've also shifted the “unsupported status” warning outside of the switch; it had been inside the
poststopbranch since it landed in 3e9549a. Go switches do not require braces around the per-case blocks, but that may have been the source of the misplacement.This is ground-work for dropping the stage environment variable from CRI-O (cri-o/cri-o#1360).