From 5da2ac5e0b69321c2afbe4fb450e31f0514cbb34 Mon Sep 17 00:00:00 2001 From: Aithal Date: Mon, 10 Apr 2017 09:31:54 -0700 Subject: [PATCH] engine: use getters instead of accessing unsafe task states directly --- agent/engine/docker_task_engine.go | 2 +- agent/engine/task_manager.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agent/engine/docker_task_engine.go b/agent/engine/docker_task_engine.go index 5aed1d75824..876706ac9cb 100644 --- a/agent/engine/docker_task_engine.go +++ b/agent/engine/docker_task_engine.go @@ -311,7 +311,7 @@ func (engine *DockerTaskEngine) emitTaskEvent(task *api.Task, reason string) { if !taskKnownStatus.BackendRecognized() { return } - if task.SentStatusUnsafe >= taskKnownStatus { + if task.GetSentStatus() >= taskKnownStatus { log.Debug("Already sent task event; no need to re-send", "task", task.Arn, "event", taskKnownStatus.String()) return } diff --git a/agent/engine/task_manager.go b/agent/engine/task_manager.go index 05db29cb8bc..cc779a9921e 100644 --- a/agent/engine/task_manager.go +++ b/agent/engine/task_manager.go @@ -129,7 +129,7 @@ func (mtask *managedTask) overseeTask() { for { // If it's steadyState, just spin until we need to do work for mtask.steadyState() { - llog.Debug("Task at steady state", "state", mtask.KnownStatusUnsafe.String()) + llog.Debug("Task at steady state", "state", mtask.GetKnownStatus().String()) maxWait := make(chan bool, 1) timer := mtask.time().After(steadyStateTaskVerifyInterval) go func() { @@ -144,7 +144,7 @@ func (mtask *managedTask) overseeTask() { } } - if !mtask.KnownStatusUnsafe.Terminal() { + if !mtask.GetKnownStatus().Terminal() { // If we aren't terminal and we aren't steady state, we should be able to move some containers along llog.Debug("Task not steady state or terminal; progressing it") mtask.progressContainers() @@ -158,7 +158,7 @@ func (mtask *managedTask) overseeTask() { if err != nil { llog.Warn("Error checkpointing task's states to disk", "err", err) } - if mtask.KnownStatusUnsafe.Terminal() { + if mtask.GetKnownStatus().Terminal() { break } }