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 )
160 lines
4.3 KiB
Go
160 lines
4.3 KiB
Go
package state
|
|
|
|
import (
|
|
"fmt"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// TombstoneGC is used to track creation of tombstones so that they can be
|
|
// garbage collected after their TTL expires. The tombstones allow queries to
|
|
// provide monotonic index values within the TTL window. The GC is used to
|
|
// prevent monotonic growth in storage usage. This is a trade off between the
|
|
// length of the TTL and the storage overhead.
|
|
//
|
|
// In practice, this is required to fix the issue of delete visibility. When
|
|
// data is deleted from the KV store, the "latest" row can go backwards if the
|
|
// newest row is removed. The tombstones provide a way to ensure time doesn't
|
|
// move backwards within some interval.
|
|
//
|
|
type TombstoneGC struct {
|
|
// ttl sets the TTL for tombstones.
|
|
ttl time.Duration
|
|
|
|
// granularity determines how we bin TTLs into timers.
|
|
granularity time.Duration
|
|
|
|
// enabled controls if we actually setup any timers.
|
|
enabled bool
|
|
|
|
// expires maps the time of expiration to the highest tombstone value
|
|
// that should be expired.
|
|
expires map[time.Time]*expireInterval
|
|
|
|
// expireCh is used to stream expiration to the leader for processing.
|
|
expireCh chan uint64
|
|
|
|
sync.Mutex
|
|
}
|
|
|
|
// expireInterval is used to track the maximum index to expire in a given
|
|
// interval with a timer.
|
|
type expireInterval struct {
|
|
// maxIndex has the highest tombstone index that should be GC-d.
|
|
maxIndex uint64
|
|
|
|
// timer is the timer tracking this bin.
|
|
timer *time.Timer
|
|
}
|
|
|
|
// NewTombstoneGC is used to construct a new TombstoneGC given a TTL for
|
|
// tombstones and a tracking granularity. Longer TTLs ensure correct behavior
|
|
// for more time, but use more storage. A shorter granularity increases the
|
|
// number of Raft transactions and reduce how far past the TTL we perform GC.
|
|
func NewTombstoneGC(ttl, granularity time.Duration) (*TombstoneGC, error) {
|
|
// Sanity check the inputs
|
|
if ttl <= 0 || granularity <= 0 {
|
|
return nil, fmt.Errorf("Tombstone TTL and granularity must be positive")
|
|
}
|
|
|
|
t := &TombstoneGC{
|
|
ttl: ttl,
|
|
granularity: granularity,
|
|
expires: make(map[time.Time]*expireInterval),
|
|
expireCh: make(chan uint64, 1),
|
|
}
|
|
return t, nil
|
|
}
|
|
|
|
// ExpireCh is used to return a channel that streams the next index that should
|
|
// be expired.
|
|
func (t *TombstoneGC) ExpireCh() <-chan uint64 {
|
|
return t.expireCh
|
|
}
|
|
|
|
// SetEnabled is used to control if the tombstone GC is
|
|
// enabled. Should only be enabled by the leader node.
|
|
func (t *TombstoneGC) SetEnabled(enabled bool) {
|
|
t.Lock()
|
|
defer t.Unlock()
|
|
if enabled == t.enabled {
|
|
return
|
|
}
|
|
|
|
// Stop all the timers and clear
|
|
if !enabled {
|
|
for _, exp := range t.expires {
|
|
exp.timer.Stop()
|
|
}
|
|
t.expires = make(map[time.Time]*expireInterval)
|
|
}
|
|
|
|
// Update the status
|
|
t.enabled = enabled
|
|
}
|
|
|
|
// Hint is used to indicate that keys at the given index have been
|
|
// deleted, and that their GC should be scheduled.
|
|
func (t *TombstoneGC) Hint(index uint64) {
|
|
expires := t.nextExpires()
|
|
|
|
t.Lock()
|
|
defer t.Unlock()
|
|
if !t.enabled {
|
|
return
|
|
}
|
|
|
|
// Check for an existing expiration timer and bump its index if we
|
|
// find one.
|
|
exp, ok := t.expires[expires]
|
|
if ok {
|
|
if index > exp.maxIndex {
|
|
exp.maxIndex = index
|
|
}
|
|
return
|
|
}
|
|
|
|
// Create a new expiration timer.
|
|
t.expires[expires] = &expireInterval{
|
|
maxIndex: index,
|
|
timer: time.AfterFunc(expires.Sub(time.Now()), func() {
|
|
t.expireTime(expires)
|
|
}),
|
|
}
|
|
}
|
|
|
|
// PendingExpiration is used to check if any expirations are pending.
|
|
func (t *TombstoneGC) PendingExpiration() bool {
|
|
t.Lock()
|
|
defer t.Unlock()
|
|
|
|
return len(t.expires) > 0
|
|
}
|
|
|
|
// nextExpires is used to calculate the next expiration time, based on the
|
|
// granularity that is set. This allows us to bin expirations and avoid a ton
|
|
// of timers.
|
|
func (t *TombstoneGC) nextExpires() time.Time {
|
|
expires := time.Now().Add(t.ttl)
|
|
remain := expires.UnixNano() % int64(t.granularity)
|
|
adj := expires.Add(t.granularity - time.Duration(remain))
|
|
return adj
|
|
}
|
|
|
|
// expireTime is used to expire the entries at the given time.
|
|
func (t *TombstoneGC) expireTime(expires time.Time) {
|
|
t.Lock()
|
|
defer t.Unlock()
|
|
|
|
// Get the maximum index and clear the entry. It's possible that the GC
|
|
// has been shut down while this timer fired and got blocked on the lock,
|
|
// so if there's nothing in the map for us we just exit out since there
|
|
// is no work to do.
|
|
exp, ok := t.expires[expires]
|
|
if !ok {
|
|
return
|
|
}
|
|
delete(t.expires, expires)
|
|
t.expireCh <- exp.maxIndex
|
|
}
|