luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Add comments and move delay calc to TaskRunner

Browse source
This commit is contained in:
Michael Schurter 2017-09-10 17:22:03 -07:00
parent a180c00fc3
commit a137676358
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client/task_runner.go
View file

@ -1716,10 +1716,11 @@ func (r *TaskRunner) Restart(source, reason string, failure bool) {
}
}
// RestartDelay returns the value of the delay for this task's restart policy
// for use by the healtcheck watcher.
// RestartDelay returns the *max* value of the delay for this task's restart
// policy for use by the healtcheck watcher.
func (r *TaskRunner) RestartDelay() time.Duration {
return r.alloc.Job.LookupTaskGroup(r.alloc.TaskGroup).RestartPolicy.Delay
delay := r.alloc.Job.LookupTaskGroup(r.alloc.TaskGroup).RestartPolicy.Delay
return delay + time.Duration(float64(delay)*jitter)
}
// Signal will send a signal to the task

17
command/agent/consul/check_watcher.go
View file

@ -15,10 +15,14 @@ const (
defaultPollFreq = 900 * time.Millisecond
)
type ConsulChecks interface {
// ChecksAPI is the part of the Consul API the checkWatcher requires.
type ChecksAPI interface {
// Checks returns a list of all checks.
Checks() (map[string]*api.AgentCheck, error)
}
// TaskRestarter allows the checkWatcher to restart tasks and how long the
// grace period should be afterward.
type TaskRestarter interface {
RestartDelay() time.Duration
Restart(source, reason string, failure bool)
@ -96,8 +100,8 @@ func (c *checkRestart) update(now time.Time, status string) {
const failure = true
c.task.Restart("healthcheck", fmt.Sprintf("check %q unhealthy", c.checkName), failure)
// Reset grace time to grace + restart.delay + (restart.delay * 25%) (the max jitter)
c.graceUntil = now.Add(c.grace + c.restartDelay + time.Duration(float64(c.restartDelay)*0.25))
// Reset grace time to grace + restart.delay
c.graceUntil = now.Add(c.grace + c.restartDelay)
c.unhealthyStart = time.Time{}
}
}
@ -105,10 +109,13 @@ func (c *checkRestart) update(now time.Time, status string) {
// checkWatcher watches Consul checks and restarts tasks when they're
// unhealthy.
type checkWatcher struct {
consul ConsulChecks
consul ChecksAPI
// pollFreq is how often to poll the checks API and defaults to
// defaultPollFreq
pollFreq time.Duration
// watchCh is how watches (and removals) are sent to the main watching loop
watchCh chan *checkRestart
// done is closed when Run has exited
@ -122,7 +129,7 @@ type checkWatcher struct {
}
// newCheckWatcher creates a new checkWatcher but does not call its Run method.
func newCheckWatcher(logger *log.Logger, consul ConsulChecks) *checkWatcher {
func newCheckWatcher(logger *log.Logger, consul ChecksAPI) *checkWatcher {
return &checkWatcher{
consul: consul,
pollFreq: defaultPollFreq,