backport fix for PR #17996 to 1.4.x #18019
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
The backport for #17996 was automatically merged by BPA but the build did not work due to missing imports and changes to the signatures of some our RPC structs. Fix the backport.
tgross
commented
Jul 20, 2023
| @@ -19,7 +19,6 @@ import ( | |||
| cconfig "github.com/hashicorp/nomad/client/config" | |||
| cstructs "github.com/hashicorp/nomad/client/structs" | |||
| "github.com/hashicorp/nomad/helper/uuid" | |||
| "github.com/hashicorp/nomad/lib/lang" | |||
There was a problem hiding this comment.
This package doesn't exist in Nomad 1.4, so I've hacked together a reasonable equivalent here with an anonymous struct.
tgross
commented
Jul 20, 2023
|
|
||
| testFn := func(pluginID string, dur time.Duration) { | ||
| defer wg.Done() | ||
| c := NewCSIVolumeEndpoint(srv, nil) | ||
| c := &CSIVolume{srv: srv, logger: nil} |
There was a problem hiding this comment.
This constructor doesn't exist in 1.4 (it was introduced as part of the RPC rate metrics work), so I'm just instantiating this directly.
lgfa29
approved these changes
Jul 20, 2023
gulducat
approved these changes
Jul 20, 2023
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.
The backport for #17996 was automatically merged by BPA but the build did not work due to missing imports and changes to the signatures of some our RPC structs. Fix the backport.