Fix stats engine race condition #4778
Open
+392
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit addresses multiple issues in the DockerStatsEngine: Race Condition Fixes: - Add context cancellation checks in taskContainerMetricsUnsafe to prevent metrics collection on containers that are in the middle of being cleaned up. - Implement removeContainerFromAllTasksUnsafe method to handle orphaned container cleanup. This prevents container leaks when the Docker Task Engine has already cleaned up the container but the stats engine still has it tracked. This fixes the condition where the ECS agent starts logging messages like this continuously for a particular container: ``` ecs_agent_logs/ecs-agent.log:1496:level=error time=2025-09-12T11:18:54Z msg="Error collecting cloudwatch metrics for container" container="111222333444555" error="need at least 1 non-NaN data points in queue to calculate CW stats set" ecs_agent_logs/ecs-agent.log:1500:level=error time=2025-09-12T11:19:14Z msg="Error collecting cloudwatch metrics for container" container="111222333444555" error="need at least 1 non-NaN data points in queue to calculate CW stats set" ecs_agent_logs/ecs-agent.log:1507:level=error time=2025-09-12T11:19:34Z msg="Error collecting cloudwatch metrics for container" container="111222333444555" error="need at least 1 non-NaN data points in queue to calculate CW stats set" ``` Unrelated but also rename engine_linux.go to engine_unix.go so that this package can compile on macOS more easily.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit addresses multiple issues in the DockerStatsEngine:
Race Condition Fixes:
This fixes the condition where the ECS agent gets stuck in a state logging messages like this continuously for a particular container:
Unrelated but also rename engine_linux.go to engine_unix.go so that this package can compile on macOS more easily.
Testing
functional testing
New tests cover the changes: yes
Description for the changelog
Bugfix: fix "Error collecting cloudwatch metrics for container" errors
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.