2015-01-06 23:48:46 +00:00
|
|
|
package consul
|
|
|
|
|
|
|
|
import (
|
2015-02-23 02:24:10 +00:00
|
|
|
"fmt"
|
2015-01-06 23:48:46 +00:00
|
|
|
|
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"
|
2017-03-27 07:15:42 +00:00
|
|
|
"github.com/hashicorp/consul/types"
|
2015-01-06 23:48:46 +00:00
|
|
|
"github.com/hashicorp/serf/serf"
|
|
|
|
)
|
|
|
|
|
|
|
|
// lanMergeDelegate is used to handle a cluster merge on the LAN gossip
|
|
|
|
// ring. We check that the peers are in the same datacenter and abort the
|
|
|
|
// merge if there is a mis-match.
|
|
|
|
type lanMergeDelegate struct {
|
2017-03-27 07:15:42 +00:00
|
|
|
dc string
|
|
|
|
nodeID types.NodeID
|
|
|
|
nodeName string
|
2015-01-06 23:48:46 +00:00
|
|
|
}
|
|
|
|
|
2015-02-23 02:24:10 +00:00
|
|
|
func (md *lanMergeDelegate) NotifyMerge(members []*serf.Member) error {
|
2017-03-27 07:15:42 +00:00
|
|
|
nodeMap := make(map[types.NodeID]string)
|
2015-01-06 23:48:46 +00:00
|
|
|
for _, m := range members {
|
2017-03-27 07:15:42 +00:00
|
|
|
if rawID, ok := m.Tags["id"]; ok && rawID != "" {
|
|
|
|
nodeID := types.NodeID(rawID)
|
|
|
|
|
|
|
|
// See if there's another node that conflicts with us.
|
|
|
|
if (nodeID == md.nodeID) && (m.Name != md.nodeName) {
|
|
|
|
return fmt.Errorf("Member '%s' has conflicting node ID '%s' with this agent's ID",
|
|
|
|
m.Name, nodeID)
|
|
|
|
}
|
|
|
|
|
|
|
|
// See if there are any two nodes that conflict with each
|
|
|
|
// other. This lets us only do joins into a hygienic
|
|
|
|
// cluster now that node IDs are critical for operation.
|
|
|
|
if other, ok := nodeMap[nodeID]; ok {
|
|
|
|
return fmt.Errorf("Member '%s' has conflicting node ID '%s' with member '%s'",
|
|
|
|
m.Name, nodeID, other)
|
|
|
|
}
|
|
|
|
nodeMap[nodeID] = m.Name
|
|
|
|
}
|
|
|
|
|
2015-01-06 23:48:46 +00:00
|
|
|
ok, dc := isConsulNode(*m)
|
|
|
|
if ok {
|
|
|
|
if dc != md.dc {
|
2015-02-23 02:24:10 +00:00
|
|
|
return fmt.Errorf("Member '%s' part of wrong datacenter '%s'",
|
2015-01-06 23:48:46 +00:00
|
|
|
m.Name, dc)
|
|
|
|
}
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
|
2016-03-30 00:39:19 +00:00
|
|
|
ok, parts := agent.IsConsulServer(*m)
|
2015-01-06 23:48:46 +00:00
|
|
|
if ok && parts.Datacenter != md.dc {
|
2015-02-23 02:24:10 +00:00
|
|
|
return fmt.Errorf("Member '%s' part of wrong datacenter '%s'",
|
2015-01-06 23:48:46 +00:00
|
|
|
m.Name, parts.Datacenter)
|
|
|
|
}
|
|
|
|
}
|
2015-02-23 02:24:10 +00:00
|
|
|
return nil
|
2015-01-06 23:48:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// wanMergeDelegate is used to handle a cluster merge on the WAN gossip
|
|
|
|
// ring. We check that the peers are server nodes and abort the merge
|
|
|
|
// otherwise.
|
|
|
|
type wanMergeDelegate struct {
|
|
|
|
}
|
|
|
|
|
2015-02-23 02:24:10 +00:00
|
|
|
func (md *wanMergeDelegate) NotifyMerge(members []*serf.Member) error {
|
2015-01-06 23:48:46 +00:00
|
|
|
for _, m := range members {
|
2016-03-30 00:39:19 +00:00
|
|
|
ok, _ := agent.IsConsulServer(*m)
|
2015-01-06 23:48:46 +00:00
|
|
|
if !ok {
|
2015-02-23 02:24:10 +00:00
|
|
|
return fmt.Errorf("Member '%s' is not a server", m.Name)
|
2015-01-06 23:48:46 +00:00
|
|
|
}
|
|
|
|
}
|
2015-02-23 02:24:10 +00:00
|
|
|
return nil
|
2015-01-06 23:48:46 +00:00
|
|
|
}
|