luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

agent: check state is purged if expired

This commit is contained in:
Ryan Uber 2015-06-05 16:59:41 -07:00
parent 7d8993e0f0
commit bd448d27fe
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
command/agent/agent.go
View File

@ -938,7 +938,7 @@ func (a *Agent) recallCheckState(check *structs.HealthCheck) error {
// Check if the state has expired
if time.Now().Unix() >= p.Expires {
a.logger.Printf("[DEBUG] agent: check state expired for %q, not restoring", check.CheckID)
return nil
return a.purgeCheckState(check.CheckID)
}
// Restore the fields from the state

8
command/agent/agent_test.go
View File

@ -1350,7 +1350,7 @@ func TestAgent_loadChecks_checkFails(t *testing.T) {
}
}
func TestAgent_persistCheckStatus(t *testing.T) {
func TestAgent_persistCheckState(t *testing.T) {
config := nextConfig()
dir, agent := makeAgent(t, config)
defer os.RemoveAll(dir)
@ -1433,6 +1433,12 @@ func TestAgent_recallCheckState(t *testing.T) {
t.Fatalf("bad: %#v", health)
}
// Should have purged the state
file := filepath.Join(agent.config.DataDir, checksDir, stringHash("check1"))
if _, err := os.Stat(file); !os.IsNotExist(err) {
t.Fatalf("should have purged state")
}
// Set a TTL which will not expire before we check it
check.TTL = time.Minute
err = agent.persistCheckState(check, structs.HealthPassing, "yup")