Add proper implementation of UnprepareResources in kubelet plugin #109
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
elezar
reviewed
May 7, 2024
cmd/nvidia-dra-plugin/driver.go
Outdated
| @@ -114,6 +113,20 @@ func (d *driver) NodePrepareResources(ctx context.Context, req *drapbv1.NodePrep | |||
| return preparedResources, nil | |||
| } | |||
|
|
|||
| func (d *driver) NodeUnprepareResources(ctx context.Context, req *drapbv1.NodeUnprepareResourcesRequest) (*drapbv1.NodeUnprepareResourcesResponse, error) { | |||
| klog.Infof("NodeUnPrepareResource is called: number of claims: %d", len(req.Claims)) | |||
There was a problem hiding this comment.
Suggested change
| klog.Infof("NodeUnPrepareResource is called: number of claims: %d", len(req.Claims)) | |
| klog.Infof("NodeUnprepareResource is called: number of claims: %d", len(req.Claims)) |
| err = d.unprepare(ctx, claim.Uid) | ||
| if err != nil { | ||
| return &drapbv1.NodeUnprepareResourceResponse{ | ||
| Error: fmt.Sprintf("error unpreparing devices for claim %v: %v", claim.Uid, err), |
There was a problem hiding this comment.
Question: Should this be "devices" or "resources"?
There was a problem hiding this comment.
I actually think either is fine since what we end up returning on success of the prepare calls is a list of CDI devices:
&drapbv1.NodePrepareResourceResponse{CDIDevices: prepared}
klueska
force-pushed
the
fix-bug-on-unprepare
branch
from
850abba to
57acdf6
Compare
Previously, we always returned SUCCESS from every call to UnprepareResources, regardless of whether we successfully unprepared the claim or not. The idea being that we would always garbage collect it later, once the claim got deallocated by the controller. This commit changes the semantics to carry out the unprepare at the point it is actually requested, returning an error if this is not possible for some reason. In the past, such errors would have been missed, and the resources could have been deallocated prematurely. Signed-off-by: Kevin Klues <[email protected]>
klueska
force-pushed
the
fix-bug-on-unprepare
branch
from
57acdf6 to
0f8ce59
Compare
elezar
approved these changes
May 7, 2024
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.
Previously, we always returned SUCCESS from every call to UnprepareResources, regardless of whether we successfully unprepared the claim or not. The idea being that we would always garbage collect it later, once the claim got deallocated by the controller.
This commit changes the semantics to carry out the unprepare at the point it is actually requested, returning an error if this is not possible for some reason. In the past, such errors would have been missed, and the resources could have been deallocated prematurely.