mirror of
https://github.com/status-im/consul.git
synced 2025-01-22 11:40:06 +00:00
Adding CheckTTL for TTL based checks
This commit is contained in:
parent
a1b2a13df5
commit
939c381d87
@ -123,3 +123,65 @@ func (c *CheckMonitor) check() {
|
|||||||
c.Logger.Printf("[WARN] Check '%v' is now critical", c.CheckID)
|
c.Logger.Printf("[WARN] Check '%v' is now critical", c.CheckID)
|
||||||
c.Notify.UpdateCheck(c.CheckID, structs.HealthCritical)
|
c.Notify.UpdateCheck(c.CheckID, structs.HealthCritical)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CheckTTL is used to apply a TTL to check status,
|
||||||
|
// and enables clients to set the status of a check
|
||||||
|
// but upon the TTL expiring, the check status is
|
||||||
|
// automatically set to critical.
|
||||||
|
type CheckTTL struct {
|
||||||
|
Notify CheckNotifier
|
||||||
|
CheckID string
|
||||||
|
TTL time.Duration
|
||||||
|
Logger *log.Logger
|
||||||
|
|
||||||
|
timer *time.Timer
|
||||||
|
|
||||||
|
stop bool
|
||||||
|
stopCh chan struct{}
|
||||||
|
stopLock sync.Mutex
|
||||||
|
}
|
||||||
|
|
||||||
|
// Start is used to start a check ttl, runs until Stop()
|
||||||
|
func (c *CheckTTL) Start() {
|
||||||
|
c.stopLock.Lock()
|
||||||
|
defer c.stopLock.Unlock()
|
||||||
|
c.stop = false
|
||||||
|
c.stopCh = make(chan struct{})
|
||||||
|
c.timer = time.NewTimer(c.TTL)
|
||||||
|
go c.run()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Stop is used to stop a check ttl.
|
||||||
|
func (c *CheckTTL) Stop() {
|
||||||
|
c.stopLock.Lock()
|
||||||
|
defer c.stopLock.Unlock()
|
||||||
|
if !c.stop {
|
||||||
|
c.timer.Stop()
|
||||||
|
c.stop = true
|
||||||
|
close(c.stopCh)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// run is used to handle TTL expiration and to update the check status
|
||||||
|
func (c *CheckTTL) run() {
|
||||||
|
for {
|
||||||
|
select {
|
||||||
|
case <-c.timer.C:
|
||||||
|
c.Logger.Printf("[WARN] Check '%v' missed TTL, is now critical",
|
||||||
|
c.CheckID)
|
||||||
|
c.Notify.UpdateCheck(c.CheckID, structs.HealthCritical)
|
||||||
|
|
||||||
|
case <-c.stopCh:
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetStatus is used to update the status of the check,
|
||||||
|
// and to renew the TTL. If expired, TTL is restarted.
|
||||||
|
func (c *CheckTTL) SetStatus(status string) {
|
||||||
|
c.Logger.Printf("[DEBUG] Check '%v' status is now %v",
|
||||||
|
c.CheckID, status)
|
||||||
|
c.Notify.UpdateCheck(c.CheckID, status)
|
||||||
|
c.timer.Reset(c.TTL)
|
||||||
|
}
|
||||||
|
@ -61,3 +61,46 @@ func TestCheckMonitor_Critical(t *testing.T) {
|
|||||||
func TestCheckMonitor_BadCmd(t *testing.T) {
|
func TestCheckMonitor_BadCmd(t *testing.T) {
|
||||||
expectStatus(t, "foobarbaz", structs.HealthCritical)
|
expectStatus(t, "foobarbaz", structs.HealthCritical)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestCheckTTL(t *testing.T) {
|
||||||
|
mock := &MockNotify{
|
||||||
|
state: make(map[string]string),
|
||||||
|
updates: make(map[string]int),
|
||||||
|
}
|
||||||
|
check := &CheckTTL{
|
||||||
|
Notify: mock,
|
||||||
|
CheckID: "foo",
|
||||||
|
TTL: 20 * time.Millisecond,
|
||||||
|
Logger: log.New(os.Stderr, "", log.LstdFlags),
|
||||||
|
}
|
||||||
|
check.Start()
|
||||||
|
defer check.Stop()
|
||||||
|
|
||||||
|
time.Sleep(10 * time.Millisecond)
|
||||||
|
check.SetStatus(structs.HealthPassing)
|
||||||
|
|
||||||
|
if mock.updates["foo"] != 1 {
|
||||||
|
t.Fatalf("should have 1 updates %v", mock.updates)
|
||||||
|
}
|
||||||
|
|
||||||
|
if mock.state["foo"] != structs.HealthPassing {
|
||||||
|
t.Fatalf("should be passing %v", mock.state)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Ensure we don't fail early
|
||||||
|
time.Sleep(15 * time.Millisecond)
|
||||||
|
if mock.updates["foo"] != 1 {
|
||||||
|
t.Fatalf("should have 1 updates %v", mock.updates)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Wait for the TTL to expire
|
||||||
|
time.Sleep(15 * time.Millisecond)
|
||||||
|
|
||||||
|
if mock.updates["foo"] != 2 {
|
||||||
|
t.Fatalf("should have 2 updates %v", mock.updates)
|
||||||
|
}
|
||||||
|
|
||||||
|
if mock.state["foo"] != structs.HealthCritical {
|
||||||
|
t.Fatalf("should be critical %v", mock.state)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user