-
Notifications
You must be signed in to change notification settings - Fork 15.4k
MINOR: fix flaky testRecordThreadIdleRatio #15987
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,8 +61,9 @@ public DelayEventAccumulator(Time time, long takeDelayMs) { | |
|
|
||
| @Override | ||
| public CoordinatorEvent take() { | ||
| CoordinatorEvent event = super.take(); | ||
| time.sleep(takeDelayMs); | ||
| return super.take(); | ||
| return event; | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -475,9 +476,9 @@ public void testRecordThreadIdleRatio() throws Exception { | |
| doAnswer(invocation -> { | ||
| long threadIdleTime = idleTimeCaptured.getValue(); | ||
| assertEquals(100, threadIdleTime); | ||
| synchronized (recordedIdleTimesMs) { | ||
| recordedIdleTimesMs.add(threadIdleTime); | ||
| } | ||
|
|
||
| // No synchronization required as the test uses a single event processor thread. | ||
| recordedIdleTimesMs.add(threadIdleTime); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: might be useful to add a comment that this is safe because |
||
| return null; | ||
| }).when(mockRuntimeMetrics).recordThreadIdleTime(idleTimeCaptured.capture()); | ||
|
|
||
|
|
||
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 was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIUC, the fix suggests the flakyness is because
super.take()returnsnullspuriously. I don't quite follow why that would happen though. Javadoc forEventAccumulator::takementions it returnsnullonly when the accumulator is closed. We also assert the value captured within doAnswer is100,recordedIdleTimesMs.size() == 8andmockRuntimeMetrics.recordThreadIdleTime()is invoked 8 times so where is the extra invocation coming from?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's correct and was my initial confusion as well. The event processor shuts down at the end of the test so we have the processor thread still running when we perform the assertions.
When we call
we may be at the point when we process the 8 events (diff == 800ms) or when the thread does another iteration over handleEvents(), which does another time.sleep() (diff == 900ms). This was causing the flakiness.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I'm still confused. Why would another iteration over
handleEvents()invoke thedoAnswer? In other words, shouldn'taccumulator.take()block since there are no more events? I'd imagineEventAccumulator::taketo block oncondition.await()after 8 events have been processed.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nvm, I see your point -
accumulator.take()may be invoked - the block on the delegate may happen after the timer has been incremented.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IIUC, it's the ordering that matters so we can avoid the null check and increment time only after
super.take()returns.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@gaurav-narula thanks for the feedback. that makes sense, i have incorporated your suggestion