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
)
263 lines
6.3 KiB
Go
263 lines
6.3 KiB
Go
package state
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
func TestGraveyard_Lifecycle(t *testing.T) {
|
|
g := NewGraveyard(nil)
|
|
|
|
// Make a donor state store to steal its database, all prepared for
|
|
// tombstones.
|
|
s := testStateStore(t)
|
|
|
|
// Create some tombstones.
|
|
func() {
|
|
tx := s.db.Txn(true)
|
|
defer tx.Abort()
|
|
|
|
if err := g.InsertTxn(tx, "foo/in/the/house", 2); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
if err := g.InsertTxn(tx, "foo/bar/baz", 5); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
if err := g.InsertTxn(tx, "foo/bar/zoo", 8); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
if err := g.InsertTxn(tx, "some/other/path", 9); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
tx.Commit()
|
|
}()
|
|
|
|
// Check some prefixes.
|
|
func() {
|
|
tx := s.db.Txn(false)
|
|
defer tx.Abort()
|
|
|
|
if idx, err := g.GetMaxIndexTxn(tx, "foo"); idx != 8 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, "foo/in/the/house"); idx != 2 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, "foo/bar/baz"); idx != 5 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, "foo/bar/zoo"); idx != 8 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, "some/other/path"); idx != 9 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, ""); idx != 9 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, "nope"); idx != 0 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
}()
|
|
|
|
// Reap some tombstones.
|
|
func() {
|
|
tx := s.db.Txn(true)
|
|
defer tx.Abort()
|
|
|
|
if err := g.ReapTxn(tx, 6); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
tx.Commit()
|
|
}()
|
|
|
|
// Check prefixes to see that the reap took effect at the right index.
|
|
func() {
|
|
tx := s.db.Txn(false)
|
|
defer tx.Abort()
|
|
|
|
if idx, err := g.GetMaxIndexTxn(tx, "foo"); idx != 8 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, "foo/in/the/house"); idx != 0 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, "foo/bar/baz"); idx != 0 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, "foo/bar/zoo"); idx != 8 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, "some/other/path"); idx != 9 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, ""); idx != 9 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
if idx, err := g.GetMaxIndexTxn(tx, "nope"); idx != 0 || err != nil {
|
|
t.Fatalf("bad: %d (%s)", idx, err)
|
|
}
|
|
}()
|
|
}
|
|
|
|
func TestGraveyard_GC_Trigger(t *testing.T) {
|
|
// Set up a fast-expiring GC.
|
|
ttl, granularity := 100*time.Millisecond, 20*time.Millisecond
|
|
gc, err := NewTombstoneGC(ttl, granularity)
|
|
if err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
|
|
// Make a new graveyard and assign the GC.
|
|
g := NewGraveyard(gc)
|
|
gc.SetEnabled(true)
|
|
|
|
// Make sure there's nothing already expiring.
|
|
if gc.PendingExpiration() {
|
|
t.Fatalf("should not have any expiring items")
|
|
}
|
|
|
|
// Create a tombstone but abort the transaction, this should not trigger
|
|
// GC.
|
|
s := testStateStore(t)
|
|
func() {
|
|
tx := s.db.Txn(true)
|
|
defer tx.Abort()
|
|
|
|
if err := g.InsertTxn(tx, "foo/in/the/house", 2); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
}()
|
|
|
|
// Make sure there's nothing already expiring.
|
|
if gc.PendingExpiration() {
|
|
t.Fatalf("should not have any expiring items")
|
|
}
|
|
|
|
// Now commit.
|
|
func() {
|
|
tx := s.db.Txn(true)
|
|
defer tx.Abort()
|
|
|
|
if err := g.InsertTxn(tx, "foo/in/the/house", 2); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
tx.Commit()
|
|
}()
|
|
|
|
// Make sure the GC got hinted.
|
|
if !gc.PendingExpiration() {
|
|
t.Fatalf("should have a pending expiration")
|
|
}
|
|
|
|
// Make sure the index looks good.
|
|
select {
|
|
case idx := <-gc.ExpireCh():
|
|
if idx != 2 {
|
|
t.Fatalf("bad index: %d", idx)
|
|
}
|
|
case <-time.After(2 * ttl):
|
|
t.Fatalf("should have gotten an expire notice")
|
|
}
|
|
}
|
|
|
|
func TestGraveyard_Snapshot_Restore(t *testing.T) {
|
|
g := NewGraveyard(nil)
|
|
|
|
// Make a donor state store to steal its database, all prepared for
|
|
// tombstones.
|
|
s := testStateStore(t)
|
|
|
|
// Create some tombstones.
|
|
func() {
|
|
tx := s.db.Txn(true)
|
|
defer tx.Abort()
|
|
|
|
if err := g.InsertTxn(tx, "foo/in/the/house", 2); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
if err := g.InsertTxn(tx, "foo/bar/baz", 5); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
if err := g.InsertTxn(tx, "foo/bar/zoo", 8); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
if err := g.InsertTxn(tx, "some/other/path", 9); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
tx.Commit()
|
|
}()
|
|
|
|
// Verify the index was set correctly.
|
|
if idx := s.maxIndex("tombstones"); idx != 9 {
|
|
t.Fatalf("bad index: %d", idx)
|
|
}
|
|
|
|
// Dump them as if we are doing a snapshot.
|
|
dump := func() []*Tombstone {
|
|
tx := s.db.Txn(false)
|
|
defer tx.Abort()
|
|
|
|
iter, err := g.DumpTxn(tx)
|
|
if err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
var dump []*Tombstone
|
|
for ti := iter.Next(); ti != nil; ti = iter.Next() {
|
|
dump = append(dump, ti.(*Tombstone))
|
|
}
|
|
return dump
|
|
}()
|
|
|
|
// Verify the dump, which should be ordered by key.
|
|
expected := []*Tombstone{
|
|
&Tombstone{Key: "foo/bar/baz", Index: 5},
|
|
&Tombstone{Key: "foo/bar/zoo", Index: 8},
|
|
&Tombstone{Key: "foo/in/the/house", Index: 2},
|
|
&Tombstone{Key: "some/other/path", Index: 9},
|
|
}
|
|
if !reflect.DeepEqual(dump, expected) {
|
|
t.Fatalf("bad: %v", dump)
|
|
}
|
|
|
|
// Make another state store and restore from the dump.
|
|
func() {
|
|
s := testStateStore(t)
|
|
func() {
|
|
tx := s.db.Txn(true)
|
|
defer tx.Abort()
|
|
|
|
for _, stone := range dump {
|
|
if err := g.RestoreTxn(tx, stone); err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
}
|
|
tx.Commit()
|
|
}()
|
|
|
|
// Verify that the restore works.
|
|
if idx := s.maxIndex("tombstones"); idx != 9 {
|
|
t.Fatalf("bad index: %d", idx)
|
|
}
|
|
|
|
dump := func() []*Tombstone {
|
|
tx := s.db.Txn(false)
|
|
defer tx.Abort()
|
|
|
|
iter, err := g.DumpTxn(tx)
|
|
if err != nil {
|
|
t.Fatalf("err: %s", err)
|
|
}
|
|
var dump []*Tombstone
|
|
for ti := iter.Next(); ti != nil; ti = iter.Next() {
|
|
dump = append(dump, ti.(*Tombstone))
|
|
}
|
|
return dump
|
|
}()
|
|
if !reflect.DeepEqual(dump, expected) {
|
|
t.Fatalf("bad: %v", dump)
|
|
}
|
|
}()
|
|
}
|