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 )
115 lines
3.1 KiB
Go
115 lines
3.1 KiB
Go
package state
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/hashicorp/go-memdb"
|
|
)
|
|
|
|
// Tombstone is the internal type used to track tombstones.
|
|
type Tombstone struct {
|
|
Key string
|
|
Index uint64
|
|
}
|
|
|
|
// Graveyard manages a set of tombstones.
|
|
type Graveyard struct {
|
|
// GC is when we create tombstones to track their time-to-live.
|
|
// The GC is consumed upstream to manage clearing of tombstones.
|
|
gc *TombstoneGC
|
|
}
|
|
|
|
// NewGraveyard returns a new graveyard.
|
|
func NewGraveyard(gc *TombstoneGC) *Graveyard {
|
|
return &Graveyard{gc: gc}
|
|
}
|
|
|
|
// InsertTxn adds a new tombstone.
|
|
func (g *Graveyard) InsertTxn(tx *memdb.Txn, key string, idx uint64) error {
|
|
// Insert the tombstone.
|
|
stone := &Tombstone{Key: key, Index: idx}
|
|
if err := tx.Insert("tombstones", stone); err != nil {
|
|
return fmt.Errorf("failed inserting tombstone: %s", err)
|
|
}
|
|
|
|
if err := tx.Insert("index", &IndexEntry{"tombstones", idx}); err != nil {
|
|
return fmt.Errorf("failed updating index: %s", err)
|
|
}
|
|
|
|
// If GC is configured, then we hint that this index requires reaping.
|
|
if g.gc != nil {
|
|
tx.Defer(func() { g.gc.Hint(idx) })
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetMaxIndexTxn returns the highest index tombstone whose key matches the
|
|
// given context, using a prefix match.
|
|
func (g *Graveyard) GetMaxIndexTxn(tx *memdb.Txn, prefix string) (uint64, error) {
|
|
stones, err := tx.Get("tombstones", "id_prefix", prefix)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("failed querying tombstones: %s", err)
|
|
}
|
|
|
|
var lindex uint64
|
|
for stone := stones.Next(); stone != nil; stone = stones.Next() {
|
|
s := stone.(*Tombstone)
|
|
if s.Index > lindex {
|
|
lindex = s.Index
|
|
}
|
|
}
|
|
return lindex, nil
|
|
}
|
|
|
|
// DumpTxn returns all the tombstones.
|
|
func (g *Graveyard) DumpTxn(tx *memdb.Txn) (memdb.ResultIterator, error) {
|
|
iter, err := tx.Get("tombstones", "id")
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return iter, nil
|
|
}
|
|
|
|
// RestoreTxn is used when restoring from a snapshot. For general inserts, use
|
|
// InsertTxn.
|
|
func (g *Graveyard) RestoreTxn(tx *memdb.Txn, stone *Tombstone) error {
|
|
if err := tx.Insert("tombstones", stone); err != nil {
|
|
return fmt.Errorf("failed inserting tombstone: %s", err)
|
|
}
|
|
|
|
if err := indexUpdateMaxTxn(tx, stone.Index, "tombstones"); err != nil {
|
|
return fmt.Errorf("failed updating index: %s", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// ReapTxn cleans out all tombstones whose index values are less than or equal
|
|
// to the given idx. This prevents unbounded storage growth of the tombstones.
|
|
func (g *Graveyard) ReapTxn(tx *memdb.Txn, idx uint64) error {
|
|
// This does a full table scan since we currently can't index on a
|
|
// numeric value. Since this is all in-memory and done infrequently
|
|
// this pretty reasonable.
|
|
stones, err := tx.Get("tombstones", "id")
|
|
if err != nil {
|
|
return fmt.Errorf("failed querying tombstones: %s", err)
|
|
}
|
|
|
|
// Find eligible tombstones.
|
|
var objs []interface{}
|
|
for stone := stones.Next(); stone != nil; stone = stones.Next() {
|
|
if stone.(*Tombstone).Index <= idx {
|
|
objs = append(objs, stone)
|
|
}
|
|
}
|
|
|
|
// Delete the tombstones in a separate loop so we don't trash the
|
|
// iterator.
|
|
for _, obj := range objs {
|
|
if err := tx.Delete("tombstones", obj); err != nil {
|
|
return fmt.Errorf("failed deleting tombstone: %s", err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|