mirror of
https://github.com/kemko/nomad.git
synced 2026-01-01 16:05:42 +03:00
27caae2b2a
In Nomad 1.4.0 we removed support for Raft Protocol v2 entirely. But the `Operator.RemoveRaftPeerByAddress` RPC handler was left in place, along with its supporting HTTP API and command line flags. Using this API will always result in the Raft library error "operation not supported with current protocol version". Unfortunately it's still possible in unit tests to exercise this code path, and these tests are quite flaky. This changeset turns the RPC handler and HTTP API into a no-op, removes the associated command line flags, and removes the flaky tests. I've also cleaned up the test for `RemoveRaftPeerByID` to consolidate test servers and use `shoenig/test`. Fixes: https://hashicorp.atlassian.net/browse/NET-12413 Ref: https://github.com/hashicorp/nomad/pull/13467 Ref: https://developer.hashicorp.com/nomad/docs/upgrade/upgrade-specific#raft-protocol-version-2-unsupported Ref: https://github.com/hashicorp/nomad-enterprise/actions/runs/13201513025/job/36855234398?pr=2302
93 lines
2.4 KiB
Go
93 lines
2.4 KiB
Go
// Copyright (c) HashiCorp, Inc.
|
|
// SPDX-License-Identifier: BUSL-1.1
|
|
|
|
package command
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/posener/complete"
|
|
)
|
|
|
|
type OperatorRaftRemoveCommand struct {
|
|
Meta
|
|
}
|
|
|
|
func (c *OperatorRaftRemoveCommand) Help() string {
|
|
helpText := `
|
|
Usage: nomad operator raft remove-peer [options]
|
|
|
|
Remove the Nomad server with given -peer-id from the Raft configuration.
|
|
|
|
There are rare cases where a peer may be left behind in the Raft quorum even
|
|
though the server is no longer present and known to the cluster. This command
|
|
can be used to remove the failed server so that it is no longer affects the
|
|
Raft quorum. If the server still shows in the output of the "nomad
|
|
server-members" command, it is preferable to clean up by simply running "nomad
|
|
server-force-leave" instead of this command.
|
|
|
|
If ACLs are enabled, this command requires a management token.
|
|
|
|
General Options:
|
|
|
|
` + generalOptionsUsage(usageOptsDefault|usageOptsNoNamespace) + `
|
|
|
|
Remove Peer Options:
|
|
|
|
-peer-id="id"
|
|
Remove a Nomad server with the given ID from the Raft configuration.
|
|
`
|
|
return strings.TrimSpace(helpText)
|
|
}
|
|
|
|
func (c *OperatorRaftRemoveCommand) AutocompleteFlags() complete.Flags {
|
|
return mergeAutocompleteFlags(c.Meta.AutocompleteFlags(FlagSetClient),
|
|
complete.Flags{
|
|
"-peer-id": complete.PredictAnything,
|
|
})
|
|
}
|
|
|
|
func (c *OperatorRaftRemoveCommand) AutocompleteArgs() complete.Predictor {
|
|
return complete.PredictNothing
|
|
}
|
|
|
|
func (c *OperatorRaftRemoveCommand) Synopsis() string {
|
|
return "Remove a Nomad server from the Raft configuration"
|
|
}
|
|
|
|
func (c *OperatorRaftRemoveCommand) Name() string { return "operator raft remove-peer" }
|
|
|
|
func (c *OperatorRaftRemoveCommand) Run(args []string) int {
|
|
var peerID string
|
|
|
|
flags := c.Meta.FlagSet("raft", FlagSetClient)
|
|
flags.Usage = func() { c.Ui.Output(c.Help()) }
|
|
|
|
flags.StringVar(&peerID, "peer-id", "", "")
|
|
if err := flags.Parse(args); err != nil {
|
|
c.Ui.Error(fmt.Sprintf("Failed to parse args: %v", err))
|
|
return 1
|
|
}
|
|
if peerID == "" {
|
|
c.Ui.Error("Missing peer id required")
|
|
return 1
|
|
}
|
|
|
|
// Set up a client.
|
|
client, err := c.Meta.Client()
|
|
if err != nil {
|
|
c.Ui.Error(fmt.Sprintf("Error initializing client: %s", err))
|
|
return 1
|
|
}
|
|
operator := client.Operator()
|
|
|
|
if err := operator.RaftRemovePeerByID(peerID, nil); err != nil {
|
|
c.Ui.Error(fmt.Sprintf("Error removing peer: %v", err))
|
|
return 1
|
|
}
|
|
|
|
c.Ui.Output(fmt.Sprintf("Removed peer with id %q", peerID))
|
|
return 0
|
|
}
|