Skip to content

Conversation

@rm-gh-8
Copy link
Contributor

@rm-gh-8 rm-gh-8 commented Dec 2, 2025

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

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8365398 needs maintainer approval

Issue

  • JDK-8365398: TEST_BUG: java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java failing intermittently (Bug - P4)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk25u-dev.git pull/46/head:pull/46
$ git checkout pull/46

Update a local copy of the PR:
$ git checkout pull/46
$ git pull https://git.openjdk.org/jdk25u-dev.git pull/46/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 46

View PR using the GUI difftool:
$ git pr show -t 46

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk25u-dev/pull/46.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 2, 2025

👋 Welcome back rm-gh-8! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Dec 2, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport 4b4d0cd35a32448e4b056109c502af2765766432 8365398: TEST_BUG: java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java failing intermittently Dec 2, 2025
@openjdk
Copy link

openjdk bot commented Dec 2, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Dec 2, 2025
@openjdk
Copy link

openjdk bot commented Dec 3, 2025

@rm-gh-8 this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

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

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Dec 3, 2025
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Dec 3, 2025
@rm-gh-8
Copy link
Contributor Author

rm-gh-8 commented Dec 3, 2025

Checked history and performed merge based on the evolution of the code which involved.

  1. The addition of the import statement (java.util.concurrent.CountDownLatch).
  2. The "(numLeft > 2)" condition which was changed to "(numLeft > 4)" then changed back to "(numLeft > 2)"

Source: https://github.com/openjdk/jdk/commits/4b4d0cd35a32448e4b056109c502af2765766432/test/jdk/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java

@rm-gh-8 rm-gh-8 marked this pull request as ready for review December 3, 2025 16:03
@openjdk openjdk bot added the rfr Pull request is ready for review label Dec 3, 2025
@mlbridge
Copy link

mlbridge bot commented Dec 3, 2025

Webrevs

import java.io.*;
import java.lang.reflect.*;
import java.rmi.registry.*;
import java.util.concurrent.CountDownLatch;
Copy link
Member

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.

Comment on lines +140 to +141
/* numLeft should not be greater than 2 - if 11 there is a problem. */
if (numLeft > 2) {
Copy link
Member

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

Copy link
Contributor Author

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)"

openjdk/jdk@5a44219

Then the following commit changed the condition in line 129/141 from "(numLeft > 4)" back to "(numLeft > 2)"

openjdk/jdk@4b4d0cd

Copy link
Member

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.

@rm-gh-8
Copy link
Contributor Author

rm-gh-8 commented Dec 3, 2025

Cancelling this PR due to the out of order commits.

@rm-gh-8 rm-gh-8 closed this Dec 3, 2025
@rm-gh-8 rm-gh-8 deleted the JDK-8365398-V25-DEV-2 branch January 13, 2026 18:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base rfr Pull request is ready for review

Development

Successfully merging this pull request may close these issues.

2 participants