Skip to content
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

8333698: [17u] TestJstatdRmiPort fails after JDK-8333667 #2543

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jun 6, 2024

Recent regression after JDK-8233725 backport. The real fix is backporting JDK-8272317, but it would take a while. Meanwhile, we can unbreak 17u-dev testing by rewriting the asserts a bit here.

Additional testing:

  • MacOS AArch64 fastdebug, sun/tools/jstatd used to fail, now fully pass

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-8333698 needs maintainer approval

Issue

  • JDK-8333698: [17u] TestJstatdRmiPort fails after JDK-8333667 (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2543

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 6, 2024

👋 Welcome back shade! 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 Jun 6, 2024

@shipilev 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:

8333698: [17u] TestJstatdRmiPort fails after JDK-8333667

Reviewed-by: mdoerr

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 8 new commits pushed to the master branch:

  • ce19e61: 8333724: Problem list security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1
  • af699ff: 8325567: jspawnhelper without args fails with segfault
  • a86a221: 8329995: Restricted access to /proc can cause JFR initialization to crash
  • 28aa19e: 8316328: Test jdk/jfr/event/oldobject/TestSanityDefault.java times out for some heap sizes
  • 9aa7b2f: 8279337: The MToolkit is still referenced in a few places
  • 2db1501: 8323801: tag doesn't strikethrough the text
  • 5377458: 8005885: enhance PrintCodeCache to print more data
  • d23f4d6: 8282526: Default icon is not painted properly

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 6, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 6, 2024

Webrevs

TheRealMDoerr referenced this pull request Jun 6, 2024
…OutputAnalyzer at the same time

8306946: jdk/test/lib/process/ProcessToolsStartProcessTest.java fails with "wrong number of lines in OutputAnalyzer output"

Reviewed-by: shade
Backport-of: 2e340e855b760e381793107f2a4d74095bd40199
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This workaround lgtm. I guess you will revert it in #2542.

@openjdk
Copy link

openjdk bot commented Jun 6, 2024

⚠️ @shipilev This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@shipilev
Copy link
Member Author

shipilev commented Jun 6, 2024

/approval request Works around a recent regression after JDK-8233725. The real fix is backporting JDK-8272317, but it would take a while. 17u-specific patch. Tests now pass. Low risk, test-only change. We will revert it when JDK-8272317 lands.

@openjdk
Copy link

openjdk bot commented Jun 6, 2024

@shipilev
8333698: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 6, 2024
@shipilev
Copy link
Member Author

shipilev commented Jun 7, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jun 7, 2024

Going to push as commit bcd19a5.
Since your change was applied there have been 13 commits pushed to the master branch:

  • 2d9b1a6: 8303942: os::write should write completely
  • 17d65fe: 8305072: Win32ShellFolder2.compareTo is inconsistent
  • ffa8a10: 8292948: JEditorPane ignores font-size styles in external linked css-file
  • 541a284: 8322726: C2: Unloaded signature class kills argument value
  • 43a6746: 8307091: A few client tests intermittently throw ConcurrentModificationException
  • ce19e61: 8333724: Problem list security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1
  • af699ff: 8325567: jspawnhelper without args fails with segfault
  • a86a221: 8329995: Restricted access to /proc can cause JFR initialization to crash
  • 28aa19e: 8316328: Test jdk/jfr/event/oldobject/TestSanityDefault.java times out for some heap sizes
  • 9aa7b2f: 8279337: The MToolkit is still referenced in a few places
  • ... and 3 more: https://git.openjdk.org/jdk17u-dev/compare/d117806dd0f4a651ac3264f81b8cf8d98db89b98...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 7, 2024
@openjdk openjdk bot closed this Jun 7, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 7, 2024
@openjdk
Copy link

openjdk bot commented Jun 7, 2024

@shipilev Pushed as commit bcd19a5.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants