From c09ce7dd99643cd265c071a743d01d16a048a96a Mon Sep 17 00:00:00 2001 From: Angel Velazquez Date: Thu, 24 Jun 2021 17:46:40 -0700 Subject: [PATCH] Remove noisy log entries --- agent/api/task/task.go | 16 ++++++++++--- agent/engine/task_manager.go | 38 +++++++++++++----------------- agent/eventhandler/task_handler.go | 6 ++--- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/agent/api/task/task.go b/agent/api/task/task.go index 188e99ebfa3..e4477bedfa6 100644 --- a/agent/api/task/task.go +++ b/agent/api/task/task.go @@ -24,6 +24,8 @@ import ( "sync" "time" + "github.com/aws/amazon-ecs-agent/agent/logger" + "github.com/aws/amazon-ecs-agent/agent/logger/field" "github.com/aws/amazon-ecs-agent/agent/utils/ttime" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/arn" @@ -1322,10 +1324,15 @@ func (task *Task) updateTaskKnownStatus() (newStatus apitaskstatus.TaskStatus) { // statuses and compute the min of this earliestKnownTaskStatus := task.getEarliestKnownTaskStatusForContainers() if task.GetKnownStatus() < earliestKnownTaskStatus { - seelog.Infof("api/task: Updating task's known status to: %s, task: %s", - earliestKnownTaskStatus.String(), task.String()) task.SetKnownStatus(earliestKnownTaskStatus) - return task.GetKnownStatus() + logger.Info("Container change also resulted in task change", logger.Fields{ + field.TaskARN: task.Arn, + field.Container: earliestKnownStatusContainer.Name, + field.RuntimeID: earliestKnownStatusContainer.RuntimeID, + field.DesiredStatus: task.GetDesiredStatus().String(), + field.KnownStatus: earliestKnownTaskStatus.String(), + }) + return earliestKnownTaskStatus } return apitaskstatus.TaskStatusNone } @@ -1902,6 +1909,9 @@ func (task *Task) updateTaskDesiredStatusUnsafe() { // A task's desired status is stopped if any essential container is stopped // Otherwise, the task's desired status is unchanged (typically running, but no need to change) for _, cont := range task.Containers { + if task.DesiredStatusUnsafe == apitaskstatus.TaskStopped { + break + } if cont.Essential && (cont.KnownTerminal() || cont.DesiredTerminal()) { seelog.Infof("api/task: Updating task desired status to stopped because of container: [%s]; task: [%s]", cont.Name, task.stringUnsafe()) diff --git a/agent/engine/task_manager.go b/agent/engine/task_manager.go index fe764938960..8cf08b1f55f 100644 --- a/agent/engine/task_manager.go +++ b/agent/engine/task_manager.go @@ -223,7 +223,7 @@ func (mtask *managedTask) overseeTask() { if !mtask.GetKnownStatus().Terminal() { // If we aren't terminal and we aren't steady state, we should be // able to move some containers along. - logger.Info("Task not steady state or terminal; progressing it", logger.Fields{ + logger.Debug("Task not steady state or terminal; progressing it", logger.Fields{ field.TaskARN: mtask.Arn, }) @@ -328,7 +328,7 @@ func (mtask *managedTask) waitSteady() { } if timedOut { - logger.Info("Checking to verify it's still at steady state", logger.Fields{ + logger.Debug("Checking to verify it's still at steady state", logger.Fields{ field.TaskARN: mtask.Arn, }) go mtask.engine.checkTaskState(mtask.Task) @@ -363,7 +363,7 @@ func (mtask *managedTask) cleanupCredentials() { // channel. When the Done channel is signalled by the context, waitEvent will // return true. func (mtask *managedTask) waitEvent(stopWaiting <-chan struct{}) bool { - logger.Info("Waiting for task event", logger.Fields{ + logger.Debug("Waiting for task event", logger.Fields{ field.TaskARN: mtask.Arn, }) select { @@ -434,12 +434,15 @@ func (mtask *managedTask) handleContainerChange(containerChange dockerContainerC container := containerChange.container runtimeID := container.GetRuntimeID() event := containerChange.event - logger.Info("Handling container change event", logger.Fields{ - field.TaskARN: mtask.Arn, - field.Container: container.Name, - field.RuntimeID: runtimeID, - field.Status: event.Status.String(), - }) + containerKnownStatus := container.GetKnownStatus() + if event.Status != containerKnownStatus { + logger.Info("Handling container change event", logger.Fields{ + field.TaskARN: mtask.Arn, + field.Container: container.Name, + field.RuntimeID: runtimeID, + field.Status: event.Status.String(), + }) + } found := mtask.isContainerFound(container) if !found { logger.Critical("State error; invoked with another task's container!", logger.Fields{ @@ -453,10 +456,9 @@ func (mtask *managedTask) handleContainerChange(containerChange dockerContainerC // If this is a backwards transition stopped->running, the first time set it // to be known running so it will be stopped. Subsequently ignore these backward transitions - containerKnownStatus := container.GetKnownStatus() mtask.handleStoppedToRunningContainerTransition(event.Status, container) if event.Status <= containerKnownStatus { - logger.Info("Container change is redundant", logger.Fields{ + logger.Debug("Container change is redundant", logger.Fields{ field.TaskARN: mtask.Arn, field.Container: container.Name, field.RuntimeID: runtimeID, @@ -511,12 +513,6 @@ func (mtask *managedTask) handleContainerChange(containerChange dockerContainerC mtask.emitContainerEvent(mtask.Task, container, "") if mtask.UpdateStatus() { - logger.Info("Container change also resulted in task change", logger.Fields{ - field.TaskARN: mtask.Arn, - field.Container: container.Name, - field.RuntimeID: runtimeID, - field.DesiredStatus: mtask.GetDesiredStatus().String(), - }) // If knownStatus changed, let it be known var taskStateChangeReason string if mtask.GetKnownStatus().Terminal() { @@ -623,7 +619,7 @@ func (mtask *managedTask) emitTaskEvent(task *apitask.Task, reason string) { }) return } - logger.Info("Sending task change event", logger.Fields{ + logger.Debug("Sending task change event", logger.Fields{ field.TaskARN: task.Arn, field.Status: event.Status.String(), field.SentStatus: task.GetSentStatus().String(), @@ -639,7 +635,7 @@ func (mtask *managedTask) emitTaskEvent(task *apitask.Task, reason string) { }) case mtask.stateChangeEvents <- event: } - logger.Info("Sent task change event", logger.Fields{ + logger.Debug("Sent task change event", logger.Fields{ field.TaskARN: mtask.Arn, field.Event: event.String(), }) @@ -692,7 +688,7 @@ func (mtask *managedTask) emitContainerEvent(task *apitask.Task, cont *apicontai } func (mtask *managedTask) doEmitContainerEvent(event api.ContainerStateChange) { - logger.Info("Sending container change event", getContainerEventLogFields(event), logger.Fields{ + logger.Debug("Sending container change event", getContainerEventLogFields(event), logger.Fields{ field.TaskARN: mtask.Arn, }) select { @@ -702,7 +698,7 @@ func (mtask *managedTask) doEmitContainerEvent(event api.ContainerStateChange) { }) case mtask.stateChangeEvents <- event: } - logger.Info("Sent container change event", getContainerEventLogFields(event), logger.Fields{ + logger.Debug("Sent container change event", getContainerEventLogFields(event), logger.Fields{ field.TaskARN: mtask.Arn, }) } diff --git a/agent/eventhandler/task_handler.go b/agent/eventhandler/task_handler.go index 9301ffbb12d..1c13a4d26e4 100644 --- a/agent/eventhandler/task_handler.go +++ b/agent/eventhandler/task_handler.go @@ -261,13 +261,13 @@ func (handler *TaskHandler) taskStateChangesToSend() []api.TaskStateChange { // batchContainerEventUnsafe collects container state change events for a given task arn func (handler *TaskHandler) batchContainerEventUnsafe(event api.ContainerStateChange) { - seelog.Infof("TaskHandler: batching container event: %s", event.String()) + seelog.Debugf("TaskHandler: batching container event: %s", event.String()) handler.tasksToContainerStates[event.TaskArn] = append(handler.tasksToContainerStates[event.TaskArn], event) } // batchManagedAgentEventUnsafe collects managed agent state change events for a given task arn func (handler *TaskHandler) batchManagedAgentEventUnsafe(event api.ManagedAgentStateChange) { - seelog.Infof("TaskHandler: batching managed agent event: %s", event.String()) + seelog.Debugf("TaskHandler: batching managed agent event: %s", event.String()) handler.tasksToManagedAgentStates[event.TaskArn] = append(handler.tasksToManagedAgentStates[event.TaskArn], event) } @@ -366,7 +366,7 @@ func (taskEvents *taskSendableEvents) sendChange(change *sendableEvent, defer taskEvents.lock.Unlock() // Add event to the queue - seelog.Infof("TaskHandler: Adding event: %s", change.toString()) + seelog.Debugf("TaskHandler: Adding event: %s", change.toString()) taskEvents.events.PushBack(change) if !taskEvents.sending {