2017-03-30 19:35:50 +00:00
|
|
|
package consul
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"net"
|
|
|
|
|
pkg refactor
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
)
2017-06-09 22:28:28 +00:00
|
|
|
"github.com/hashicorp/consul/agent/consul/agent"
|
|
|
|
"github.com/hashicorp/consul/agent/consul/structs"
|
2017-03-30 19:35:50 +00:00
|
|
|
"github.com/hashicorp/raft"
|
|
|
|
"github.com/hashicorp/serf/serf"
|
|
|
|
)
|
|
|
|
|
|
|
|
// RaftGetConfiguration is used to retrieve the current Raft configuration.
|
|
|
|
func (op *Operator) RaftGetConfiguration(args *structs.DCSpecificRequest, reply *structs.RaftConfigurationResponse) error {
|
|
|
|
if done, err := op.srv.forward("Operator.RaftGetConfiguration", args, args, reply); done {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// This action requires operator read access.
|
|
|
|
acl, err := op.srv.resolveToken(args.Token)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if acl != nil && !acl.OperatorRead() {
|
2017-04-21 00:02:42 +00:00
|
|
|
return errPermissionDenied
|
2017-03-30 19:35:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// We can't fetch the leader and the configuration atomically with
|
|
|
|
// the current Raft API.
|
|
|
|
future := op.srv.raft.GetConfiguration()
|
|
|
|
if err := future.Error(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// Index the Consul information about the servers.
|
|
|
|
serverMap := make(map[raft.ServerAddress]serf.Member)
|
|
|
|
for _, member := range op.srv.serfLAN.Members() {
|
|
|
|
valid, parts := agent.IsConsulServer(member)
|
|
|
|
if !valid {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
|
|
|
addr := (&net.TCPAddr{IP: member.Addr, Port: parts.Port}).String()
|
|
|
|
serverMap[raft.ServerAddress(addr)] = member
|
|
|
|
}
|
|
|
|
|
|
|
|
// Fill out the reply.
|
|
|
|
leader := op.srv.raft.Leader()
|
|
|
|
reply.Index = future.Index()
|
|
|
|
for _, server := range future.Configuration().Servers {
|
|
|
|
node := "(unknown)"
|
|
|
|
if member, ok := serverMap[server.Address]; ok {
|
|
|
|
node = member.Name
|
|
|
|
}
|
|
|
|
|
|
|
|
entry := &structs.RaftServer{
|
|
|
|
ID: server.ID,
|
|
|
|
Node: node,
|
|
|
|
Address: server.Address,
|
|
|
|
Leader: server.Address == leader,
|
|
|
|
Voter: server.Suffrage == raft.Voter,
|
|
|
|
}
|
|
|
|
reply.Servers = append(reply.Servers, entry)
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// RaftRemovePeerByAddress is used to kick a stale peer (one that it in the Raft
|
|
|
|
// quorum but no longer known to Serf or the catalog) by address in the form of
|
|
|
|
// "IP:port". The reply argument is not used, but it required to fulfill the RPC
|
|
|
|
// interface.
|
|
|
|
func (op *Operator) RaftRemovePeerByAddress(args *structs.RaftRemovePeerRequest, reply *struct{}) error {
|
|
|
|
if done, err := op.srv.forward("Operator.RaftRemovePeerByAddress", args, args, reply); done {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// This is a super dangerous operation that requires operator write
|
|
|
|
// access.
|
|
|
|
acl, err := op.srv.resolveToken(args.Token)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if acl != nil && !acl.OperatorWrite() {
|
2017-04-21 00:02:42 +00:00
|
|
|
return errPermissionDenied
|
2017-03-30 19:35:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Since this is an operation designed for humans to use, we will return
|
|
|
|
// an error if the supplied address isn't among the peers since it's
|
|
|
|
// likely they screwed up.
|
|
|
|
{
|
|
|
|
future := op.srv.raft.GetConfiguration()
|
|
|
|
if err := future.Error(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
for _, s := range future.Configuration().Servers {
|
|
|
|
if s.Address == args.Address {
|
|
|
|
args.ID = s.ID
|
|
|
|
goto REMOVE
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return fmt.Errorf("address %q was not found in the Raft configuration",
|
|
|
|
args.Address)
|
|
|
|
}
|
|
|
|
|
|
|
|
REMOVE:
|
|
|
|
// The Raft library itself will prevent various forms of foot-shooting,
|
|
|
|
// like making a configuration with no voters. Some consideration was
|
|
|
|
// given here to adding more checks, but it was decided to make this as
|
|
|
|
// low-level and direct as possible. We've got ACL coverage to lock this
|
|
|
|
// down, and if you are an operator, it's assumed you know what you are
|
|
|
|
// doing if you are calling this. If you remove a peer that's known to
|
|
|
|
// Serf, for example, it will come back when the leader does a reconcile
|
|
|
|
// pass.
|
|
|
|
minRaftProtocol, err := ServerMinRaftProtocol(op.srv.serfLAN.Members())
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
var future raft.Future
|
|
|
|
if minRaftProtocol >= 2 {
|
|
|
|
future = op.srv.raft.RemoveServer(args.ID, 0, 0)
|
|
|
|
} else {
|
|
|
|
future = op.srv.raft.RemovePeer(args.Address)
|
|
|
|
}
|
|
|
|
if err := future.Error(); err != nil {
|
|
|
|
op.srv.logger.Printf("[WARN] consul.operator: Failed to remove Raft peer %q: %v",
|
|
|
|
args.Address, err)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
op.srv.logger.Printf("[WARN] consul.operator: Removed Raft peer %q", args.Address)
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// RaftRemovePeerByID is used to kick a stale peer (one that is in the Raft
|
|
|
|
// quorum but no longer known to Serf or the catalog) by address in the form of
|
|
|
|
// "IP:port". The reply argument is not used, but is required to fulfill the RPC
|
|
|
|
// interface.
|
|
|
|
func (op *Operator) RaftRemovePeerByID(args *structs.RaftRemovePeerRequest, reply *struct{}) error {
|
|
|
|
if done, err := op.srv.forward("Operator.RaftRemovePeerByID", args, args, reply); done {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
// This is a super dangerous operation that requires operator write
|
|
|
|
// access.
|
|
|
|
acl, err := op.srv.resolveToken(args.Token)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if acl != nil && !acl.OperatorWrite() {
|
2017-04-21 00:02:42 +00:00
|
|
|
return errPermissionDenied
|
2017-03-30 19:35:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Since this is an operation designed for humans to use, we will return
|
|
|
|
// an error if the supplied id isn't among the peers since it's
|
|
|
|
// likely they screwed up.
|
|
|
|
{
|
|
|
|
future := op.srv.raft.GetConfiguration()
|
|
|
|
if err := future.Error(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
for _, s := range future.Configuration().Servers {
|
|
|
|
if s.ID == args.ID {
|
|
|
|
args.Address = s.Address
|
|
|
|
goto REMOVE
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return fmt.Errorf("id %q was not found in the Raft configuration",
|
|
|
|
args.ID)
|
|
|
|
}
|
|
|
|
|
|
|
|
REMOVE:
|
|
|
|
// The Raft library itself will prevent various forms of foot-shooting,
|
|
|
|
// like making a configuration with no voters. Some consideration was
|
|
|
|
// given here to adding more checks, but it was decided to make this as
|
|
|
|
// low-level and direct as possible. We've got ACL coverage to lock this
|
|
|
|
// down, and if you are an operator, it's assumed you know what you are
|
|
|
|
// doing if you are calling this. If you remove a peer that's known to
|
|
|
|
// Serf, for example, it will come back when the leader does a reconcile
|
|
|
|
// pass.
|
|
|
|
minRaftProtocol, err := ServerMinRaftProtocol(op.srv.serfLAN.Members())
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
var future raft.Future
|
|
|
|
if minRaftProtocol >= 2 {
|
|
|
|
future = op.srv.raft.RemoveServer(args.ID, 0, 0)
|
|
|
|
} else {
|
|
|
|
future = op.srv.raft.RemovePeer(args.Address)
|
|
|
|
}
|
|
|
|
if err := future.Error(); err != nil {
|
|
|
|
op.srv.logger.Printf("[WARN] consul.operator: Failed to remove Raft peer with id %q: %v",
|
|
|
|
args.ID, err)
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
op.srv.logger.Printf("[WARN] consul.operator: Removed Raft peer with id %q", args.ID)
|
|
|
|
return nil
|
|
|
|
}
|