Prevent resetting valid agent state db when IMDS fails on startup #3509
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
sparrc
force-pushed
the
imds-instance-id-state-reset
branch
from
f8a15f3 to
93b2324
Compare
sparrc
force-pushed
the
imds-instance-id-state-reset
branch
from
93b2324 to
99ed01b
Compare
| @@ -602,7 +602,10 @@ func TestMetricsDisabled(t *testing.T) { | |||
| published <- struct{}{} | |||
| }).Return(nil).MinTimes(1) | |||
|
|
|||
| go cs.Serve() | |||
| go func() { | |||
There was a problem hiding this comment.
Do we need this change as part of this PR?(was is it an intended change?)
There was a problem hiding this comment.
Yes sorry I meant to comment on this before sending for review.
This test randomly failed on me once and I was trying to debug, but I couldn't figure anything out without knowing what happened to this Serve() function call.
Afterwards I couldnt reproduce. If it's just very slightly flakey, at least in the future we can see if this function failed so I thought we should keep it in, since it's harmless to check this in a unit test anyways.
yinyic
approved these changes
Dec 8, 2022
mythri-garaga
approved these changes
Dec 8, 2022
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.
Summary
This is a followup to #2861
In the rare occasion that IMDS fails multiple times (also bumping this multiple from 3 to 5), then we should try to avoid resetting the agent state db if we have an existing agent state.
This is to prevent a situation like this from occurring, since resetting the state db will result in a duplicate container instance on the same ec2 instance id, and will also result in some tasks being dropped by the agent.
Implementation details
currentEC2InstanceIDwill fallback to the instance ID saved in agent's state db if IMDS fails to return an ec2 instance id.Testing
New tests cover the changes: no
existing functional tests
Description for the changelog
Bugfix: Prevent resetting valid agent state db when IMDS fails on startup
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.