cd837b0b18
command/agent/* -> agent/* command/consul/* -> agent/consul/* command/agent/command{,_test}.go -> command/agent{,_test}.go command/base/command.go -> command/base.go command/base/* -> command/* commands.go -> command/commands.go The script which did the refactor is: ( cd $GOPATH/src/github.com/hashicorp/consul git mv command/agent/command.go command/agent.go git mv command/agent/command_test.go command/agent_test.go git mv command/agent/flag_slice_value{,_test}.go command/ git mv command/agent . git mv command/base/command.go command/base.go git mv command/base/config_util{,_test}.go command/ git mv commands.go command/ git mv consul agent rmdir command/base/ gsed -i -e 's|package agent|package command|' command/agent{,_test}.go gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go gsed -i -e 's|package main|package command|' command/commands.go gsed -i -e 's|base.Command|BaseCommand|' command/commands.go gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go gsed -i -e 's|base\.||' command/commands.go gsed -i -e 's|command\.||' command/commands.go gsed -i -e 's|command|c|' main.go gsed -i -e 's|range Commands|range command.Commands|' main.go gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go gsed -i -e 's|base.Command|BaseCommand|' command/*.go gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go gsed -i -e 's|base\.||' command/*_test.go gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go # fix imports f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f goimports -w $f f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f goimports -w $f goimports -w command/*.go main.go )
98 lines
2.6 KiB
Go
98 lines
2.6 KiB
Go
package command
|
|
|
|
import (
|
|
"flag"
|
|
"fmt"
|
|
"strings"
|
|
)
|
|
|
|
type OperatorRaftCommand struct {
|
|
BaseCommand
|
|
}
|
|
|
|
func (c *OperatorRaftCommand) Help() string {
|
|
helpText := `
|
|
Usage: consul operator raft <subcommand> [options]
|
|
|
|
The Raft operator command is used to interact with Consul's Raft subsystem. The
|
|
command can be used to verify Raft peers or in rare cases to recover quorum by
|
|
removing invalid peers.
|
|
|
|
Subcommands:
|
|
|
|
list-peers Display the current Raft peer configuration
|
|
remove-peer Remove a Consul server from the Raft configuration
|
|
|
|
`
|
|
|
|
return strings.TrimSpace(helpText)
|
|
}
|
|
|
|
func (c *OperatorRaftCommand) Synopsis() string {
|
|
return "Provides cluster-level tools for Consul operators"
|
|
}
|
|
|
|
func (c *OperatorRaftCommand) Run(args []string) int {
|
|
if result := c.raft(args); result != nil {
|
|
c.UI.Error(result.Error())
|
|
return 1
|
|
}
|
|
return 0
|
|
}
|
|
|
|
// raft handles the raft subcommands.
|
|
func (c *OperatorRaftCommand) raft(args []string) error {
|
|
f := c.BaseCommand.NewFlagSet(c)
|
|
|
|
// Parse verb arguments.
|
|
var listPeers, removePeer bool
|
|
f.BoolVar(&listPeers, "list-peers", false,
|
|
"If this flag is provided, the current Raft peer configuration will be "+
|
|
"displayed. If the cluster is in an outage state without a leader, you may need "+
|
|
"to set -stale to 'true' to get the configuration from a non-leader server.")
|
|
f.BoolVar(&removePeer, "remove-peer", false,
|
|
"If this flag is provided, the Consul server with the given -address will be "+
|
|
"removed from the Raft configuration.")
|
|
|
|
// Parse other arguments.
|
|
var address string
|
|
f.StringVar(&address, "address", "",
|
|
"The address to remove from the Raft configuration.")
|
|
|
|
// Leave these flags for backwards compatibility, but hide them
|
|
// TODO: remove flags/behavior from this command in Consul 0.9
|
|
c.BaseCommand.HideFlags("list-peers", "remove-peer", "address")
|
|
|
|
if err := c.BaseCommand.Parse(args); err != nil {
|
|
if err == flag.ErrHelp {
|
|
return nil
|
|
}
|
|
return err
|
|
}
|
|
|
|
// Set up a client.
|
|
client, err := c.BaseCommand.HTTPClient()
|
|
if err != nil {
|
|
return fmt.Errorf("error connecting to Consul agent: %s", err)
|
|
}
|
|
|
|
// Dispatch based on the verb argument.
|
|
if listPeers {
|
|
result, err := raftListPeers(client, c.BaseCommand.HTTPStale())
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error getting peers: %v", err))
|
|
}
|
|
c.UI.Output(result)
|
|
} else if removePeer {
|
|
if err := raftRemovePeers(address, "", client.Operator()); err != nil {
|
|
return fmt.Errorf("Error removing peer: %v", err)
|
|
}
|
|
c.UI.Output(fmt.Sprintf("Removed peer with address %q", address))
|
|
} else {
|
|
c.UI.Output(c.Help())
|
|
return nil
|
|
}
|
|
|
|
return nil
|
|
}
|