jdk17u-dev icon indicating copy to clipboard operation
jdk17u-dev copied to clipboard

8318696: Do not use LFS64 symbols on Linux

Open MBaesken opened this issue 1 year ago • 8 comments
trafficstars

Backport 8318696 from jdk21u-dev


Progress

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

Issue

  • JDK-8318696: Do not use LFS64 symbols on Linux (Bug - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2173

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

Using diff file

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

Webrev

Link to Webrev Comment

MBaesken avatar Jan 24 '24 14:01 MBaesken

had to add changes to os::available (os_linux.cpp)

MBaesken avatar Jan 24 '24 14:01 MBaesken

:wave: Welcome back mbaesken! 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.

bridgekeeper[bot] avatar Jan 24 '24 14:01 bridgekeeper[bot]

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

openjdk[bot] avatar Jan 24 '24 14:01 openjdk[bot]

Webrevs

mlbridge[bot] avatar Jan 24 '24 14:01 mlbridge[bot]

There were some issues with COPYRIGHT headers, and also diffs in the stride. Additionally , I addressed os::available (os_linux.cpp) where also some calls needed to be changed.

MBaesken avatar Jan 24 '24 16:01 MBaesken

@MBaesken This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

bridgekeeper[bot] avatar Feb 21 '24 19:02 bridgekeeper[bot]

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

8318696: Do not use LFS64 symbols on Linux

Reviewed-by: andrew

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

  • 77cb961ce0573c9c1057d51556784ea43a71ba53: 8323122: AArch64: Increase itable stub size estimate
  • fb7bb62c74cdcff03b92db31021fa3325ec0ec05: 8310628: GcInfoBuilder.c missing JNI Exception checks
  • 666e4890ed39f50b99f57e10fc0da9458047d27d: 8317228: GC: Make TestXXXHeapSizeFlags use createTestJvm
  • c18ddd88936456e6bba50e00d769761d7a15ea2d: 8321176: [Screencast] make a second attempt on screencast failure
  • fe1a4a80707b39fd8f13d12557fe41958849cfc7: 8276660: Scalability bottleneck in java.security.Provider.getService()
  • 9ef505de3ac622e5ada962ecaf3d19956f19e77b: 8315651: Stop hiding AIX specific multicast socket errors via NetworkConfiguration (aix)

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[bot] avatar Mar 13 '24 19:03 openjdk[bot]

@MBaesken This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

bridgekeeper[bot] avatar Apr 10 '24 21:04 bridgekeeper[bot]

@MBaesken This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

bridgekeeper[bot] avatar May 09 '24 00:05 bridgekeeper[bot]

@MBaesken are you still wanting to push forward with this? If so, I can review. It would be nice to finally get this fixed in older releases, at least on the HotSpot side (the JDK patch JDK-8324539 looks a bit more involved). We've hit issues with this recently on 8u which were hard to reproduce.

gnu-andrew avatar Jul 25 '24 00:07 gnu-andrew

/open

MBaesken avatar Jul 25 '24 07:07 MBaesken

@MBaesken are you still wanting to push forward with this?

Yeah let's do that for jdk17 at least.

MBaesken avatar Jul 25 '24 07:07 MBaesken

@MBaesken This pull request is now open

openjdk[bot] avatar Jul 25 '24 07:07 openjdk[bot]

@MBaesken 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 backport-MBaesken-2697a9d1
git fetch https://git.openjdk.org/jdk17u-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[bot] avatar Jul 25 '24 07:07 openjdk[bot]

Also, I presume we'll also need JDK-8324753 for AIX as a follow-up?

gnu-andrew avatar Jul 26 '24 01:07 gnu-andrew

Also, I presume we'll also need JDK-8324753 for AIX as a follow-up?

Yes I think so .

MBaesken avatar Jul 26 '24 07:07 MBaesken

The only change I'm curious about is in os::current_file_offset & os::seek_to_file_offset as they retain off64_t casts. The 21u >version uses off_t. Was this deliberate or just missed?

Hi Andrew, I think we have to use off_t here. Thanks for looking into this.

MBaesken avatar Jul 26 '24 07:07 MBaesken

⚠️ @MBaesken 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.

openjdk[bot] avatar Jul 26 '24 19:07 openjdk[bot]

Thanks for the review !

MBaesken avatar Jul 29 '24 06:07 MBaesken

/integrate

MBaesken avatar Jul 29 '24 12:07 MBaesken

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

  • 77cb961ce0573c9c1057d51556784ea43a71ba53: 8323122: AArch64: Increase itable stub size estimate
  • fb7bb62c74cdcff03b92db31021fa3325ec0ec05: 8310628: GcInfoBuilder.c missing JNI Exception checks
  • 666e4890ed39f50b99f57e10fc0da9458047d27d: 8317228: GC: Make TestXXXHeapSizeFlags use createTestJvm
  • c18ddd88936456e6bba50e00d769761d7a15ea2d: 8321176: [Screencast] make a second attempt on screencast failure
  • fe1a4a80707b39fd8f13d12557fe41958849cfc7: 8276660: Scalability bottleneck in java.security.Provider.getService()
  • 9ef505de3ac622e5ada962ecaf3d19956f19e77b: 8315651: Stop hiding AIX specific multicast socket errors via NetworkConfiguration (aix)

Your commit was automatically rebased without conflicts.

openjdk[bot] avatar Jul 29 '24 12:07 openjdk[bot]

@MBaesken Pushed as commit 2b9228a3c92590e3146ecad468bb2ea68a5a6bb2.

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

openjdk[bot] avatar Jul 29 '24 12:07 openjdk[bot]