-
Notifications
You must be signed in to change notification settings - Fork 38
8365398: TEST_BUG: java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java failing intermittently #46
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 rm-gh-8! A progress list of the required criteria for merging this PR into |
|
❗ This change is not yet ready to be integrated. |
|
This backport pull request has now been updated with issue from the original commit. |
|
@rm-gh-8 this pull request can not be integrated into git checkout JDK-8365398-V25-DEV-2
git fetch https://git.openjdk.org/jdk25u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push |
|
Checked history and performed merge based on the evolution of the code which involved.
|
| import java.io.*; | ||
| import java.lang.reflect.*; | ||
| import java.rmi.registry.*; | ||
| import java.util.concurrent.CountDownLatch; |
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 can see why you would want to do this, as mainline change introduced this out-of-order. But for backports, you want to stay faithful to the original commit as much as possible. So refrain from making cosmetic changes as you go. If you still want to fix this, you can do a trivial PR against mainline, and backport the follow-up fix. But I think it does not worth the trouble.
| /* numLeft should not be greater than 2 - if 11 there is a problem. */ | ||
| if (numLeft > 2) { |
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 don't understand your comment: "The "(numLeft > 2)" condition which was changed to "(numLeft > 4)" then changed back to "(numLeft > 2)". AFAICS, the original commit has this hunk exactly as you have written here?
openjdk/jdk@4b4d0cd#diff-9348ad66aa09ad1a3d437e736b0ec93f9f674ba91864fd15ca59375093386548L128-R141
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.
This commit changed the condition in line 132/129 of "CheckLeaseLeak.java" from "(numLeft > 2)" to "(numLeft > 4)"
Then the following commit changed the condition in line 129/141 from "(numLeft > 4)" back to "(numLeft > 2)"
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.
Yes, but why does it matter for this backport? openjdk/jdk@5a44219 is already in 25u. So openjdk/jdk@4b4d0cd that you are backporting is clean addition on top of it?
I am just confused why the merge was even required.
|
Cancelling this PR due to the out of order commits. |
Backporting JDK-8365398: TEST_BUG: java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java failing intermittently.
For parity with Oracle JDK. Increased available object count threshold to 6 (half of total created objects) to fix intermittent macOS test failures caused by slower garbage collection.
Merge conflict (resolved) was a change in class import ordering and the correction of a comment.
Ran GHA Sanity Checks (passed), jtreg tier1 tests (passed) and related tests (passed) on linux-x64, linux-aarch64, macos-aarch64 and windows-x64:
(Passed) - make test-tier1
(Passed) - make test TEST=test/jdk/java/rmi/transport
Results are attached.
linux-aarch64-jtreg-tier1.log
linux-aarch64-specific-test.log
linux-x64-jtreg-tier1.log
linux-x64-specific-test.log
macos-aarch64-jtreg-tier1.log
macos-aarch64-specific-test.log
windows-x64-jtreg-tier1.log
windows-x64-specific-test.log
Progress
Issue
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk25u-dev.git pull/46/head:pull/46$ git checkout pull/46Update a local copy of the PR:
$ git checkout pull/46$ git pull https://git.openjdk.org/jdk25u-dev.git pull/46/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 46View PR using the GUI difftool:
$ git pr show -t 46Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk25u-dev/pull/46.diff
Using Webrev
Link to Webrev Comment