Fix panic when source PVC does not exist #381
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
checkAndUpdateSnapshotClass must always return a snapshot, even though it fails somewhere in ctrl.SetDefaultSnapshotClass. Add unit tests for that.
k8s-ci-robot
added
release-note
k8s-ci-robot
added
the
size/M
|
/retest |
xing-yang
reviewed
Sep 30, 2020
| @@ -317,6 +317,7 @@ func (ctrl *csiSnapshotCommonController) syncContentByKey(key string) error { | |||
|
|
|||
| // checkAndUpdateSnapshotClass gets the VolumeSnapshotClass from VolumeSnapshot. If it is not set, | |||
| // gets it from default VolumeSnapshotClass and sets it. | |||
| // On error, it returns the original snapshot. | |||
There was a problem hiding this comment.
Can you change to the following?
On error, it must return the original snapshot, not nil, because the caller syncContentByKey needs to check snapshot's timestamp.
jsafrane
force-pushed
the
fix-nil-default-class
branch
from
3bc4aea to
73f72bd
Compare
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jsafrane, xing-yang The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
xing-yang
added a commit
to xing-yang/external-snapshotter
that referenced
this pull request
Oct 31, 2020
Cherry-pick kubernetes-csi#381. Fixed crash of snapshot-controller when source PVC of a snapshot to take does not exist.
Merged
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.
checkAndUpdateSnapshotClassmust always return a snapshot, even though it fails somewhere inctrl.SetDefaultSnapshotClass-syncSnapshotByKeypanics with nil return. I tried to fixsyncSnapshotByKeyto allow nil return, but the resulting code was just ugly.While the real fix is one-liner in snapshot_controller_base.go, the PR is bigger due to test refactoring -
testCallmust have an opportunity to return a "fatal" error, even though a "normal" error is expected./kind bug
Fixes: #380