Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #570 #692

Merged
merged 1 commit into from
Feb 10, 2017
Merged

Fix #570 #692

merged 1 commit into from
Feb 10, 2017

Conversation

richardpen
Copy link

@richardpen richardpen commented Feb 1, 2017

Summary

Fix #570 which could cause agent crash

Implementation details

Adding a lock to ImageState when saving agent state using json.Marshal.

Testing

  • Builds on Linux (make release)
  • Builds on Windows (go build -out amazon-ecs-agent.exe ./agent)
  • Unit tests on Linux (make test) pass
  • Unit tests on Windows (go test -timeout=25s ./agent/...) pass
  • Integration tests on Linux (make run-integ-tests) pass
  • Integration tests on Windows (.\scripts\run-integ-tests.ps1) pass
  • Functional tests on Linux (make run-functional-tests) pass
  • Functional tests on Windows (.\scripts\run-functional-tests.ps1) pass

New tests cover the changes:

Description for the changelog

  • Fix a issue where agent could crash.

Licensing

This contribution is under the terms of the Apache 2.0 License:
yes

@richardpen richardpen merged commit e66feed into aws:dev Feb 10, 2017
@samuelkarp samuelkarp added this to the 1.14.1 milestone Feb 11, 2017
@richardpen richardpen deleted the race-condition-fix branch February 13, 2017 23:13
@adnxn adnxn mentioned this pull request Mar 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants