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 )
184 lines
4.7 KiB
Go
184 lines
4.7 KiB
Go
package command
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/serf/coordinate"
|
|
)
|
|
|
|
// RTTCommand is a Command implementation that allows users to query the
|
|
// estimated round trip time between nodes using network coordinates.
|
|
type RTTCommand struct {
|
|
BaseCommand
|
|
}
|
|
|
|
func (c *RTTCommand) Help() string {
|
|
helpText := `
|
|
Usage: consul rtt [options] node1 [node2]
|
|
|
|
Estimates the round trip time between two nodes using Consul's network
|
|
coordinate model of the cluster.
|
|
|
|
At least one node name is required. If the second node name isn't given, it
|
|
is set to the agent's node name. Note that these are node names as known to
|
|
Consul as "consul members" would show, not IP addresses.
|
|
|
|
By default, the two nodes are assumed to be nodes in the local datacenter
|
|
and the LAN coordinates are used. If the -wan option is given, then the WAN
|
|
coordinates are used, and the node names must be suffixed by a period and
|
|
the datacenter (eg. "myserver.dc1").
|
|
|
|
It is not possible to measure between LAN coordinates and WAN coordinates
|
|
because they are maintained by independent Serf gossip areas, so they are
|
|
not compatible.
|
|
|
|
` + c.BaseCommand.Help()
|
|
|
|
return strings.TrimSpace(helpText)
|
|
}
|
|
|
|
func (c *RTTCommand) Run(args []string) int {
|
|
var wan bool
|
|
|
|
f := c.BaseCommand.NewFlagSet(c)
|
|
|
|
f.BoolVar(&wan, "wan", false, "Use WAN coordinates instead of LAN coordinates.")
|
|
|
|
if err := c.BaseCommand.Parse(args); err != nil {
|
|
return 1
|
|
}
|
|
|
|
// They must provide at least one node.
|
|
nodes := f.Args()
|
|
if len(nodes) < 1 || len(nodes) > 2 {
|
|
c.UI.Error("One or two node names must be specified")
|
|
c.UI.Error("")
|
|
c.UI.Error(c.Help())
|
|
return 1
|
|
}
|
|
|
|
// Create and test the HTTP client.
|
|
client, err := c.BaseCommand.HTTPClient()
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error connecting to Consul agent: %s", err))
|
|
return 1
|
|
}
|
|
coordClient := client.Coordinate()
|
|
|
|
var source string
|
|
var coord1, coord2 *coordinate.Coordinate
|
|
if wan {
|
|
source = "WAN"
|
|
|
|
// Default the second node to the agent if none was given.
|
|
if len(nodes) < 2 {
|
|
agent := client.Agent()
|
|
self, err := agent.Self()
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Unable to look up agent info: %s", err))
|
|
return 1
|
|
}
|
|
|
|
node, dc := self["Config"]["NodeName"], self["Config"]["Datacenter"]
|
|
nodes = append(nodes, fmt.Sprintf("%s.%s", node, dc))
|
|
}
|
|
|
|
// Parse the input nodes.
|
|
parts1 := strings.Split(nodes[0], ".")
|
|
parts2 := strings.Split(nodes[1], ".")
|
|
if len(parts1) != 2 || len(parts2) != 2 {
|
|
c.UI.Error("Node names must be specified as <node name>.<datacenter> with -wan")
|
|
return 1
|
|
}
|
|
node1, dc1 := parts1[0], parts1[1]
|
|
node2, dc2 := parts2[0], parts2[1]
|
|
|
|
// Pull all the WAN coordinates.
|
|
dcs, err := coordClient.Datacenters()
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error getting coordinates: %s", err))
|
|
return 1
|
|
}
|
|
|
|
// See if the requested nodes are in there. We only compare
|
|
// coordinates in the same areas.
|
|
var area1, area2 string
|
|
for _, dc := range dcs {
|
|
for _, entry := range dc.Coordinates {
|
|
if dc.Datacenter == dc1 && entry.Node == node1 {
|
|
area1 = dc.AreaID
|
|
coord1 = entry.Coord
|
|
}
|
|
if dc.Datacenter == dc2 && entry.Node == node2 {
|
|
area2 = dc.AreaID
|
|
coord2 = entry.Coord
|
|
}
|
|
|
|
if area1 == area2 && coord1 != nil && coord2 != nil {
|
|
goto SHOW_RTT
|
|
}
|
|
}
|
|
}
|
|
|
|
// Nil out the coordinates so we don't display across areas if
|
|
// we didn't find anything.
|
|
coord1, coord2 = nil, nil
|
|
} else {
|
|
source = "LAN"
|
|
|
|
// Default the second node to the agent if none was given.
|
|
if len(nodes) < 2 {
|
|
agent := client.Agent()
|
|
node, err := agent.NodeName()
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Unable to look up agent info: %s", err))
|
|
return 1
|
|
}
|
|
nodes = append(nodes, node)
|
|
}
|
|
|
|
// Pull all the LAN coordinates.
|
|
entries, _, err := coordClient.Nodes(nil)
|
|
if err != nil {
|
|
c.UI.Error(fmt.Sprintf("Error getting coordinates: %s", err))
|
|
return 1
|
|
}
|
|
|
|
// See if the requested nodes are in there.
|
|
for _, entry := range entries {
|
|
if entry.Node == nodes[0] {
|
|
coord1 = entry.Coord
|
|
}
|
|
if entry.Node == nodes[1] {
|
|
coord2 = entry.Coord
|
|
}
|
|
|
|
if coord1 != nil && coord2 != nil {
|
|
goto SHOW_RTT
|
|
}
|
|
}
|
|
}
|
|
|
|
// Make sure we found both coordinates.
|
|
if coord1 == nil {
|
|
c.UI.Error(fmt.Sprintf("Could not find a coordinate for node %q", nodes[0]))
|
|
return 1
|
|
}
|
|
if coord2 == nil {
|
|
c.UI.Error(fmt.Sprintf("Could not find a coordinate for node %q", nodes[1]))
|
|
return 1
|
|
}
|
|
|
|
SHOW_RTT:
|
|
|
|
// Report the round trip time.
|
|
dist := fmt.Sprintf("%.3f ms", coord1.DistanceTo(coord2).Seconds()*1000.0)
|
|
c.UI.Output(fmt.Sprintf("Estimated %s <-> %s rtt: %s (using %s coordinates)", nodes[0], nodes[1], dist, source))
|
|
return 0
|
|
}
|
|
|
|
func (c *RTTCommand) Synopsis() string {
|
|
return "Estimates network round trip time between nodes"
|
|
}
|