refactor: make nodeForControllerPlugin private to ClientCSI #7688
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
The current design of `ClientCSI` RPC requires that callers in the server know about the free-standing `nodeForControllerPlugin` function. This makes it difficult to send `ClientCSI` RPC messages from subpackages of `nomad` and adds a bunch of boilerplate to every caller for a controller RPC. This changeset makes it so that the `ClientCSI` RPCs will populate and validate the controller's client node ID if it hasn't been passed by the caller, centralizing the logic of picking and validating controller targets into the `nomad.ClientCSI` struct.
tgross
commented
Apr 10, 2020
|
|
||
| // controllerPublishVolume sends publish request to the CSI controller | ||
| // plugin associated with a volume, if any. | ||
| func (srv *Server) controllerPublishVolume(req *structs.CSIVolumeClaimRequest, resp *structs.CSIVolumeClaimResponse) error { |
There was a problem hiding this comment.
I dunno why we originally had this sitting in Server instead of ClientCSI, but it doesn't need to be exposed at that level anymore. Moved it up with the rest of the methods for ClientCSI
tgross
commented
Apr 10, 2020
|
|
||
| plugin, err := state.CSIPluginByID(ws, "minnie") | ||
| require.NoError(t, err) | ||
| nodeID, err := srv.staticEndpoints.ClientCSI.nodeForController(plugin.ID, "") |
There was a problem hiding this comment.
This was the only test change. It got moved from csi_endpoint_test.go and this line was the only required change (b/c of the new signature).
tgross
added a commit
that referenced
this pull request
Apr 13, 2020
Follow-up for a method missed in the refactor for #7688. The `volAndPluginLookup` method is only ever called from the server's `CSI` RPC and never the `ClientCSI` RPC, so move it into that scope.
tgross
added a commit
that referenced
this pull request
Apr 13, 2020
Follow-up for a method missed in the refactor for #7688. The `volAndPluginLookup` method is only ever called from the server's `CSI` RPC and never the `ClientCSI` RPC, so move it into that scope.
|
I'm going to lock this pull request because it has been closed for 120 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 work came out of ongoing work I'm doing for #7629.
The current design of
ClientCSIRPC requires that callers in the server know about the free-standingnodeForControllerPluginfunction. This makes it difficult to sendClientCSIRPC messages from subpackages ofnomadand adds a bunch of boilerplate to every server-side caller of a controller RPC.This changeset makes it so that the
ClientCSIRPCs will populate and validate the controller's client node ID if it hasn't been passed by the caller, centralizing the logic of picking and validating controller targets into thenomad.ClientCSIstruct.