-
Notifications
You must be signed in to change notification settings - Fork 6.1k
8362602: Add test.timeout.factor to CompileFactory to avoid test timeouts #26388
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
Conversation
👋 Welcome back dbriemann! A progress list of the required criteria for merging this PR into |
@dbriemann This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be:
You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 49 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@mhaessig, @MBaesken, @RealCLanger) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
@dbriemann The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
Webrevs
|
@@ -40,6 +40,7 @@ | |||
*/ | |||
class Compile { | |||
private static final int COMPILE_TIMEOUT = 60; | |||
private static final float timeoutFactor = Float.parseFloat(System.getProperty("test.timeout.factor", "1.0")); |
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.
Should we update the copyright year.
@@ -182,7 +183,8 @@ private static void executeCompileCommand(List<String> command) { | |||
int exitCode; | |||
try { | |||
Process process = builder.start(); | |||
boolean exited = process.waitFor(COMPILE_TIMEOUT, TimeUnit.SECONDS); | |||
long timeout = COMPILE_TIMEOUT * (long)Math.pow(2, timeoutFactor-1); |
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.
Is there a reason for scaling the timeout exponentially instead of linearly, as jtreg does it and most users would expect?
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.
I thought that I saw this documented somewhere but I cannot find it anymore and in other places it is used linearly, like you say.
I adapted it.
Thank you, @dbriemann, for addressing my comment. I just kicked off testing on our side and will keep you posted on the results. |
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.
Testing passed.
Thanks for your reviews! |
@dbriemann |
/sponsor |
Going to push as commit f8c8bcf.
Your commit was automatically rebased without conflicts. |
@RealCLanger @dbriemann Pushed as commit f8c8bcf. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
Add the TimeoutFactor property to the CompileFramework to avoid timeouts on different systems.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/26388/head:pull/26388
$ git checkout pull/26388
Update a local copy of the PR:
$ git checkout pull/26388
$ git pull https://git.openjdk.org/jdk.git pull/26388/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 26388
View PR using the GUI difftool:
$ git pr show -t 26388
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/26388.diff
Using Webrev
Link to Webrev Comment