2015-06-30 21:25:40 +00:00
|
|
|
package consul
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
"sort"
|
|
|
|
|
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/structs"
|
2017-03-14 05:56:24 +00:00
|
|
|
"github.com/hashicorp/consul/lib"
|
2015-06-30 21:25:40 +00:00
|
|
|
"github.com/hashicorp/serf/coordinate"
|
|
|
|
)
|
|
|
|
|
|
|
|
// nodeSorter takes a list of nodes and a parallel vector of distances and
|
|
|
|
// implements sort.Interface, keeping both structures coherent and sorting by
|
|
|
|
// distance.
|
|
|
|
type nodeSorter struct {
|
|
|
|
Nodes structs.Nodes
|
|
|
|
Vec []float64
|
|
|
|
}
|
|
|
|
|
|
|
|
// newNodeSorter returns a new sorter for the given source coordinate and set of
|
|
|
|
// nodes.
|
|
|
|
func (s *Server) newNodeSorter(c *coordinate.Coordinate, nodes structs.Nodes) (sort.Interface, error) {
|
|
|
|
state := s.fsm.State()
|
|
|
|
vec := make([]float64, len(nodes))
|
|
|
|
for i, node := range nodes {
|
2015-10-23 22:19:14 +00:00
|
|
|
coord, err := state.CoordinateGetRaw(node.Node)
|
2015-06-30 21:25:40 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2017-03-14 05:56:24 +00:00
|
|
|
vec[i] = lib.ComputeDistance(c, coord)
|
2015-06-30 21:25:40 +00:00
|
|
|
}
|
|
|
|
return &nodeSorter{nodes, vec}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *nodeSorter) Len() int {
|
|
|
|
return len(n.Nodes)
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *nodeSorter) Swap(i, j int) {
|
|
|
|
n.Nodes[i], n.Nodes[j] = n.Nodes[j], n.Nodes[i]
|
|
|
|
n.Vec[i], n.Vec[j] = n.Vec[j], n.Vec[i]
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *nodeSorter) Less(i, j int) bool {
|
|
|
|
return n.Vec[i] < n.Vec[j]
|
|
|
|
}
|
|
|
|
|
|
|
|
// serviceNodeSorter takes a list of service nodes and a parallel vector of
|
|
|
|
// distances and implements sort.Interface, keeping both structures coherent and
|
|
|
|
// sorting by distance.
|
|
|
|
type serviceNodeSorter struct {
|
|
|
|
Nodes structs.ServiceNodes
|
|
|
|
Vec []float64
|
|
|
|
}
|
|
|
|
|
|
|
|
// newServiceNodeSorter returns a new sorter for the given source coordinate and
|
|
|
|
// set of service nodes.
|
|
|
|
func (s *Server) newServiceNodeSorter(c *coordinate.Coordinate, nodes structs.ServiceNodes) (sort.Interface, error) {
|
|
|
|
state := s.fsm.State()
|
|
|
|
vec := make([]float64, len(nodes))
|
|
|
|
for i, node := range nodes {
|
2015-10-23 22:19:14 +00:00
|
|
|
coord, err := state.CoordinateGetRaw(node.Node)
|
2015-06-30 21:25:40 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2017-03-14 05:56:24 +00:00
|
|
|
vec[i] = lib.ComputeDistance(c, coord)
|
2015-06-30 21:25:40 +00:00
|
|
|
}
|
|
|
|
return &serviceNodeSorter{nodes, vec}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *serviceNodeSorter) Len() int {
|
|
|
|
return len(n.Nodes)
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *serviceNodeSorter) Swap(i, j int) {
|
|
|
|
n.Nodes[i], n.Nodes[j] = n.Nodes[j], n.Nodes[i]
|
|
|
|
n.Vec[i], n.Vec[j] = n.Vec[j], n.Vec[i]
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *serviceNodeSorter) Less(i, j int) bool {
|
|
|
|
return n.Vec[i] < n.Vec[j]
|
|
|
|
}
|
|
|
|
|
2015-07-27 21:41:46 +00:00
|
|
|
// serviceNodeSorter takes a list of health checks and a parallel vector of
|
|
|
|
// distances and implements sort.Interface, keeping both structures coherent and
|
|
|
|
// sorting by distance.
|
|
|
|
type healthCheckSorter struct {
|
|
|
|
Checks structs.HealthChecks
|
2015-07-29 23:33:25 +00:00
|
|
|
Vec []float64
|
2015-07-27 21:41:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// newHealthCheckSorter returns a new sorter for the given source coordinate and
|
|
|
|
// set of health checks with nodes.
|
|
|
|
func (s *Server) newHealthCheckSorter(c *coordinate.Coordinate, checks structs.HealthChecks) (sort.Interface, error) {
|
|
|
|
state := s.fsm.State()
|
|
|
|
vec := make([]float64, len(checks))
|
|
|
|
for i, check := range checks {
|
2015-10-23 22:19:14 +00:00
|
|
|
coord, err := state.CoordinateGetRaw(check.Node)
|
2015-07-27 21:41:46 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2017-03-14 05:56:24 +00:00
|
|
|
vec[i] = lib.ComputeDistance(c, coord)
|
2015-07-27 21:41:46 +00:00
|
|
|
}
|
|
|
|
return &healthCheckSorter{checks, vec}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *healthCheckSorter) Len() int {
|
|
|
|
return len(n.Checks)
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *healthCheckSorter) Swap(i, j int) {
|
|
|
|
n.Checks[i], n.Checks[j] = n.Checks[j], n.Checks[i]
|
|
|
|
n.Vec[i], n.Vec[j] = n.Vec[j], n.Vec[i]
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *healthCheckSorter) Less(i, j int) bool {
|
|
|
|
return n.Vec[i] < n.Vec[j]
|
|
|
|
}
|
|
|
|
|
|
|
|
// checkServiceNodeSorter takes a list of service nodes and a parallel vector of
|
|
|
|
// distances and implements sort.Interface, keeping both structures coherent and
|
|
|
|
// sorting by distance.
|
|
|
|
type checkServiceNodeSorter struct {
|
|
|
|
Nodes structs.CheckServiceNodes
|
|
|
|
Vec []float64
|
|
|
|
}
|
|
|
|
|
|
|
|
// newCheckServiceNodeSorter returns a new sorter for the given source coordinate
|
|
|
|
// and set of nodes with health checks.
|
|
|
|
func (s *Server) newCheckServiceNodeSorter(c *coordinate.Coordinate, nodes structs.CheckServiceNodes) (sort.Interface, error) {
|
|
|
|
state := s.fsm.State()
|
|
|
|
vec := make([]float64, len(nodes))
|
|
|
|
for i, node := range nodes {
|
2015-10-23 22:19:14 +00:00
|
|
|
coord, err := state.CoordinateGetRaw(node.Node.Node)
|
2015-07-27 21:41:46 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2017-03-14 05:56:24 +00:00
|
|
|
vec[i] = lib.ComputeDistance(c, coord)
|
2015-07-27 21:41:46 +00:00
|
|
|
}
|
|
|
|
return &checkServiceNodeSorter{nodes, vec}, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *checkServiceNodeSorter) Len() int {
|
|
|
|
return len(n.Nodes)
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *checkServiceNodeSorter) Swap(i, j int) {
|
|
|
|
n.Nodes[i], n.Nodes[j] = n.Nodes[j], n.Nodes[i]
|
|
|
|
n.Vec[i], n.Vec[j] = n.Vec[j], n.Vec[i]
|
|
|
|
}
|
|
|
|
|
|
|
|
// See sort.Interface.
|
|
|
|
func (n *checkServiceNodeSorter) Less(i, j int) bool {
|
|
|
|
return n.Vec[i] < n.Vec[j]
|
|
|
|
}
|
|
|
|
|
2015-06-30 21:25:40 +00:00
|
|
|
// newSorterByDistanceFrom returns a sorter for the given type.
|
|
|
|
func (s *Server) newSorterByDistanceFrom(c *coordinate.Coordinate, subj interface{}) (sort.Interface, error) {
|
|
|
|
switch v := subj.(type) {
|
|
|
|
case structs.Nodes:
|
|
|
|
return s.newNodeSorter(c, v)
|
|
|
|
case structs.ServiceNodes:
|
|
|
|
return s.newServiceNodeSorter(c, v)
|
2015-07-27 21:41:46 +00:00
|
|
|
case structs.HealthChecks:
|
|
|
|
return s.newHealthCheckSorter(c, v)
|
|
|
|
case structs.CheckServiceNodes:
|
|
|
|
return s.newCheckServiceNodeSorter(c, v)
|
2015-06-30 21:25:40 +00:00
|
|
|
default:
|
|
|
|
panic(fmt.Errorf("Unhandled type passed to newSorterByDistanceFrom: %#v", subj))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-02 22:36:59 +00:00
|
|
|
// sortNodesByDistanceFrom is used to sort results from our service catalog based
|
|
|
|
// on the round trip time from the given source node. Nodes with missing coordinates
|
|
|
|
// will get stable sorted at the end of the list.
|
2015-07-24 19:53:50 +00:00
|
|
|
//
|
|
|
|
// If coordinates are disabled this will be a no-op.
|
2015-07-02 22:36:59 +00:00
|
|
|
func (s *Server) sortNodesByDistanceFrom(source structs.QuerySource, subj interface{}) error {
|
2015-07-24 21:17:23 +00:00
|
|
|
// We can't sort if there's no source node.
|
|
|
|
if source.Node == "" {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-06-30 21:25:40 +00:00
|
|
|
// We can't compare coordinates across DCs.
|
|
|
|
if source.Datacenter != s.config.Datacenter {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
// There won't always be a coordinate for the source node. If there's not
|
|
|
|
// one then we can bail out because there's no meaning for the sort.
|
|
|
|
state := s.fsm.State()
|
2015-10-23 22:19:14 +00:00
|
|
|
coord, err := state.CoordinateGetRaw(source.Node)
|
2015-06-30 21:25:40 +00:00
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
if coord == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-07-24 19:53:50 +00:00
|
|
|
// Do the sort!
|
2015-06-30 21:25:40 +00:00
|
|
|
sorter, err := s.newSorterByDistanceFrom(coord, subj)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
sort.Stable(sorter)
|
|
|
|
return nil
|
|
|
|
}
|