mirror of
https://github.com/status-im/consul.git
synced 2025-01-11 14:24:39 +00:00
a49711b8bf
This patch refactors the commands that use the mitchellh/cli library to populate the command line flag set in both the Run() and the Help() method. Earlier versions of the mitchellh/cli library relied on the Run() method to populuate the flagset for generating the usage screen. This has changed in later versions and was previously solved with a small monkey patch to the library to restore the old behavior. However, this makes upgrading the library difficult since the patch has to be restored every time. This patch addresses this by moving the command line flags into an initFlags() method where appropriate and also moving all variables for the flags from the Run() method into the command itself. Fixes #3536
99 lines
2.4 KiB
Go
99 lines
2.4 KiB
Go
package command
|
|
|
|
import (
|
|
"flag"
|
|
"fmt"
|
|
|
|
"github.com/hashicorp/consul/api"
|
|
)
|
|
|
|
type OperatorRaftRemoveCommand struct {
|
|
BaseCommand
|
|
|
|
// flags
|
|
address string
|
|
id string
|
|
}
|
|
|
|
func (c *OperatorRaftRemoveCommand) initFlags() {
|
|
c.InitFlagSet()
|
|
c.FlagSet.StringVar(&c.address, "address", "",
|
|
"The address to remove from the Raft configuration.")
|
|
c.FlagSet.StringVar(&c.id, "id", "",
|
|
"The ID to remove from the Raft configuration.")
|
|
}
|
|
|
|
func (c *OperatorRaftRemoveCommand) Help() string {
|
|
c.initFlags()
|
|
return c.HelpCommand(`
|
|
Usage: consul operator raft remove-peer [options]
|
|
|
|
Remove the Consul server with given -address 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 "consul members" command,
|
|
it is preferable to clean up by simply running "consul force-leave" instead of
|
|
this command.
|
|
|
|
`)
|
|
}
|
|
|
|
func (c *OperatorRaftRemoveCommand) Synopsis() string {
|
|
return "Remove a Consul server from the Raft configuration"
|
|
}
|
|
|
|
func (c *OperatorRaftRemoveCommand) Run(args []string) int {
|
|
c.initFlags()
|
|
if err := c.FlagSet.Parse(args); err != nil {
|
|
if err == flag.ErrHelp {
|
|
return 0
|
|
}
|
|
c.UI.Error(fmt.Sprintf("Failed to parse args: %v", err))
|
|
return 1
|
|
}
|
|
|
|
// Set up a client.
|
|
client, err := c.HTTPClient()
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error initializing client: %s", err))
|
|
return 1
|
|
}
|
|
|
|
// Fetch the current configuration.
|
|
if err := raftRemovePeers(c.address, c.id, client.Operator()); err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error removing peer: %v", err))
|
|
return 1
|
|
}
|
|
if c.address != "" {
|
|
c.UI.Output(fmt.Sprintf("Removed peer with address %q", c.address))
|
|
} else {
|
|
c.UI.Output(fmt.Sprintf("Removed peer with id %q", c.id))
|
|
}
|
|
|
|
return 0
|
|
}
|
|
|
|
func raftRemovePeers(address, id string, operator *api.Operator) error {
|
|
if len(address) == 0 && len(id) == 0 {
|
|
return fmt.Errorf("an address or id is required for the peer to remove")
|
|
}
|
|
if len(address) > 0 && len(id) > 0 {
|
|
return fmt.Errorf("cannot give both an address and id")
|
|
}
|
|
|
|
// Try to kick the peer.
|
|
if len(address) > 0 {
|
|
if err := operator.RaftRemovePeerByAddress(address, nil); err != nil {
|
|
return err
|
|
}
|
|
} else {
|
|
if err := operator.RaftRemovePeerByID(id, nil); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|