cr: fix checkpoint from image getting skipped#4544
Merged
estesp merged 1 commit intocontainerd:masterfrom Sep 16, 2020
Merged
Conversation
Fix restoring from a checkpoint image always getting skipped when no checkpoint image path is set. As one restores either from an image OR a path, this makes no sense. Signed-off-by: Jakob Schrettenbrunner <[email protected]>
|
Build succeeded.
|
|
Build succeeded.
|
Member
|
LGTM |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fixes an issue with restoring from a checkpoint image. One either restores from an image or a path, but currently restoring from an image only works if a path is set as well.
It looks like a simple logical error: The path apparently is supposed to take precedence over the image, so restoring form an image should only be done when no checkpoint path is set. Therefore a
checkpointPath == ""makes more sense thancheckpointPath != "".I haven't tested this (yet), but I'll do so when I have the time.