Check the sentstatus before updating #1383
Merged
Conversation
This file contains 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
aaithal
requested changes
May 10, 2018
| @@ -186,14 +186,16 @@ type setStatusSent func(event *sendableEvent) | |||
|
|
|||
| // setContainerChangeSent sets the event's container change object as sent | |||
| func setContainerChangeSent(event *sendableEvent) { | |||
| if event.containerChange.Container != nil { | |||
| if event.containerChange.Container != nil && | |||
There was a problem hiding this comment.
can you just assign event.containerChange.Container to a var and reuse it in this method so that it's easier to read this code?
| event.containerChange.Container.SetSentStatus(event.containerChange.Status) | ||
| } | ||
| } | ||
|
|
||
| // setTaskChangeSent sets the event's task change object as sent | ||
| func setTaskChangeSent(event *sendableEvent) { | ||
| if event.taskChange.Task != nil { | ||
| if event.taskChange.Task != nil && |
There was a problem hiding this comment.
can you just assign event.taskChange.Task to a var and reuse it in this method so that it's easier to read this code?
aaithal
approved these changes
May 10, 2018
| if event.containerChange.Container != nil { | ||
| event.containerChange.Container.SetSentStatus(event.containerChange.Status) | ||
| containerChangeStatus := event.containerChange.Status | ||
| if event.containerChange.Container != nil && |
There was a problem hiding this comment.
event.containerChange.Container can be a var as well
| if event.taskChange.Task != nil { | ||
| event.taskChange.Task.SetSentStatus(event.taskChange.Status) | ||
| taskChangeStatus := event.taskChange.Status | ||
| if event.taskChange.Task != nil && |
There was a problem hiding this comment.
event.taskChange.Task can be a var as well
added 2 commits
May 11, 2018 16:17
There could be a case that SubmitTaskStateChange for STOPPED happened before RUNNING, where the sentstatus of the task would be set to RUNNING. This PR fix this by checking the sentstatus before updating.
petderek
approved these changes
May 11, 2018
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.
There could be a case that SubmitTaskStateChange for STOPPED happened
before RUNNING, where the sentstatus of the task would be set to
RUNNING. This PR fix this by checking the sentstatus before updating.
Summary
Implementation details
Testing
make release)go build -out amazon-ecs-agent.exe ./agent)make test) passgo test -timeout=25s ./agent/...) passmake run-integ-tests) pass.\scripts\run-integ-tests.ps1) passmake run-functional-tests) pass.\scripts\run-functional-tests.ps1) passNew tests cover the changes:
Description for the changelog
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.