-
Notifications
You must be signed in to change notification settings - Fork 6.3k
8368625: com/sun/net/httpserver/ServerStopTerminationTest.java fails intermittently in tier7 #27670
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
Open
myankelev
wants to merge
4
commits into
openjdk:master
Choose a base branch
from
myankelev:JDK-8368625
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
4 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -124,13 +124,14 @@ public void shouldAwaitActiveExchange() throws InterruptedException { | |
|
||
// Complete the exchange one second into the future | ||
final Duration exchangeDuration = Duration.ofSeconds(1); | ||
final long startTime = System.nanoTime(); // taking custom start time just in case | ||
completeExchange(exchangeDuration); | ||
log("Complete Exchange triggered"); | ||
|
||
// Time the shutdown sequence | ||
final Duration delayDuration = Duration.ofSeconds(Utils.adjustTimeout(5)); | ||
final Duration delayDuration = Duration.ofSeconds(Utils.adjustTimeout(20)); | ||
log("Shutdown triggered with the delay of " + delayDuration.getSeconds()); | ||
final long elapsed = timeShutdown(delayDuration); | ||
final long elapsed = timeShutdown(delayDuration, startTime); | ||
log("Shutdown complete"); | ||
|
||
// The shutdown should take at least as long as the exchange duration | ||
|
@@ -161,14 +162,15 @@ public void shouldCompeteAfterDelay() throws InterruptedException { | |
// Complete the exchange 10 second into the future. | ||
// Runs in parallel, so won't block the server stop | ||
final Duration exchangeDuration = Duration.ofSeconds(Utils.adjustTimeout(10)); | ||
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. Looks good, but if this test fail we could envisage bumping that delay though. A better implementation could be to complete the exchange after exiting from server.stop() - without using any virtual thread, and just verifying that the server.stop() waited at least for 1s. |
||
final long startTime = System.nanoTime(); // taking custom start time just in case | ||
completeExchange(exchangeDuration); | ||
log("Complete Exchange triggered"); | ||
|
||
|
||
// Time the shutdown sequence | ||
final Duration delayDuration = Duration.ofSeconds(1); | ||
log("Shutdown triggered with the delay of " + delayDuration.getSeconds()); | ||
final long elapsed = timeShutdown(delayDuration); | ||
final long elapsed = timeShutdown(delayDuration, startTime); | ||
log("Shutdown complete"); | ||
|
||
|
||
|
@@ -277,7 +279,14 @@ public void shouldAllowRepeatedStop() { | |
*/ | ||
private long timeShutdown(Duration delayDuration) { | ||
final long startTime = System.nanoTime(); | ||
return timeShutdown(delayDuration, startTime); | ||
} | ||
|
||
/** | ||
* This allows passing a custom start time | ||
*/ | ||
private long timeShutdown(Duration delayDuration, | ||
long startTime) { | ||
server.stop((int) delayDuration.toSeconds()); | ||
return System.nanoTime() - startTime; | ||
} | ||
|
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.