test: fixing a deadlock in simtime#6956
Merged
alyssawilk merged 3 commits intoenvoyproxy:masterfrom May 15, 2019
Merged
Conversation
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
jmarantz
approved these changes
May 15, 2019
Contributor
jmarantz
left a comment
There was a problem hiding this comment.
Thanks & nice detective work!
alyssawilk
added a commit
to alyssawilk/envoy
that referenced
this pull request
May 15, 2019
Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
htuch
pushed a commit
that referenced
this pull request
May 22, 2019
* test: adding an integration test framework for file-based LDS Signed-off-by: Alyssa Wilk <alyssar@chromium.org> * on by default Signed-off-by: Alyssa Wilk <alyssar@chromium.org> * deflaking integration test Signed-off-by: Alyssa Wilk <alyssar@chromium.org> * reviwer comments Signed-off-by: Alyssa Wilk <alyssar@chromium.org> * enabling test now #6956 landed Signed-off-by: Alyssa Wilk <alyssar@chromium.org> * Fix merge flake Signed-off-by: Alyssa Wilk <alyssar@chromium.org>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
If in one event loop, two things tried to post to a dispatcher, the dispatcher would (multiple times) set a 0 ms timer. For both instances, simtime would see the duration was 0, call activateLockHeld, increment pending alarms and set the base alarm to fire.
The base alarm would only fire once though, so the pending alarms would decrement once, pending would be true for ever and the whole system would "deadlock" waiting for pending to decrease to 0.
The symptom was the fault filter alarm being set to 200ms in #6933 but because of the extra dispatcher post triggering this deadlock the test would spin forever.
Risk Level: low (test only)
Testing: new unit test, verified fault filter test now works in the LDS PR
Docs Changes: n/a
Release Notes: n/a