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

JDK-8266797: Fix for 8266610 breaks the build on macos #3943

Closed
wants to merge 3 commits into from

Conversation

vyommani
Copy link
Contributor

@vyommani vyommani commented May 10, 2021

this change will include the below headers files to Linux only.
#include <linux/fs.h>
#include <sys/stat.h>


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8266797: Fix for 8266610 breaks the build on macos

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3943/head:pull/3943
$ git checkout pull/3943

Update a local copy of the PR:
$ git checkout pull/3943
$ git pull https://git.openjdk.java.net/jdk pull/3943/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3943

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3943.diff

@vyommani vyommani marked this pull request as draft May 10, 2021 06:34
@vyommani vyommani marked this pull request as ready for review May 10, 2021 06:35
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Hi Vyom,

That fixes the include file problem but as this was obviously not tested on non-Linux have you checked that the rest of the fix for 8266610 works okay on non-Linux?

Thanks,
David

@vyommani
Copy link
Contributor Author

Hi Vyom,

That fixes the include file problem but as this was obviously not tested on non-Linux have you checked that the rest of the fix for 8266610 works okay on non-Linux?

Thanks,
David

Hi David,

Original fix was intended to Linux specific. Current Fix will not impact other platforms.

There is existing test (java/nio/channels/FileChannel/BlockDeviceSize.java) which test the new code but currently it is silently passing without running the test. This test requires root access.

Please see the bug( https://bugs.openjdk.java.net/browse/JDK-8150539)

Thanks,
Vyom

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

MacOS builds fail with GHA since recently. So enabling GHA would serve a basic test for this to work.

@pavelrappo
Copy link
Member

@vyommani how are you going to test this?

@vyommani
Copy link
Contributor Author

@vyommani how are you going to test this?

I tested locally at my Linux environment. we have a test "java/nio/channels/FileChannel/BlockDeviceSize.java" but it requires root privileged , i ran this as well as a root. Please have a look into this(https://bugs.openjdk.java.net/browse/JDK-8150539).

@pavelrappo
Copy link
Member

The fix to 8266610 caused a build failure on macOS. What is your plan to make sure this won't happen with this change?

@jayathirthrao
Copy link
Member

@vyommani You can start tier1 CI build to make sure build passes with this fix.

@vyommani
Copy link
Contributor Author

@vyommani You can start tier1 CI build to make sure build passes with this fix.

can you please do let me know how to start tier1 CI build ?

@jayathirthrao
Copy link
Member

/test tier1

@pavelrappo
Copy link
Member

I would recommend enabling GitHub Actions for the "vyommani/jdk" repo.

@vyommani
Copy link
Contributor Author

/test tier1

@dholmes-ora
Copy link
Member

Original fix was intended to Linux specific. Current Fix will not impact other platforms.

Your original fix failed to be Linux specific, so given you never actually tested it on other platforms you don't know whether another part of the fix is also not actually Linux-specific.

At a minimum ensure you have GitHub actions enabled so that your fixes get some basic cross-platform testing before they are integrated. Thanks.

@openjdk
Copy link

openjdk bot commented May 10, 2021

Could not create test job

@dholmes-ora
Copy link
Member

The /test functionality doesn't work. You need to either test locally or using GitHub actions.

@vyommani
Copy link
Contributor Author

somehow tests not working for me. https://github.com/vyommani/jdk/actions/runs/827989185

@pavelrappo
Copy link
Member

I have run this PR through our CI: the tier1 tests are fine on all supported platforms. Please integrate this PR as soon as possible.

Separately, please sort out the way you test your PRs. Read the error message that the failed GitHub Actions gave you:

Prerequisites
Actions jobs for this repository have been disabled by GitHub staff. If you are the repository owner, you can contact support via github.com/contact for more information.

@jayathirthrao
Copy link
Member

In internal CI with fix tier 1 builds are running fine.

@bridgekeeper
Copy link

bridgekeeper bot commented May 10, 2021

👋 Welcome back vtewari! 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.

@vyommani
Copy link
Contributor Author

In internal CI with fix tier 1 builds are running fine.

Ok i will integrate my changes now.

@openjdk
Copy link

openjdk bot commented May 10, 2021

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

8266797: Fix for 8266610 breaks the build on macos

Reviewed-by: dholmes, jdv

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

  • 53db2a0: 8226384: Implement a better logic to switch between OpenGL and Metal pipeline
  • 1603ca2: 8241248: NullPointerException in sun.security.ssl.HKDF.extract(HKDF.java:93)
  • 0f925d1: 8266015: Implement AdapterHandlerLibrary lookup fast-path for common adapters

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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 10, 2021
@vyommani
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 10, 2021

@vyommani The following label will be automatically applied to this pull request:

  • core-libs

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.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label May 10, 2021
@mlbridge
Copy link

mlbridge bot commented May 10, 2021

Webrevs

@openjdk openjdk bot closed this May 10, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 10, 2021
@openjdk
Copy link

openjdk bot commented May 10, 2021

@vyommani Since your change was applied there have been 3 commits pushed to the master branch:

  • 53db2a0: 8226384: Implement a better logic to switch between OpenGL and Metal pipeline
  • 1603ca2: 8241248: NullPointerException in sun.security.ssl.HKDF.extract(HKDF.java:93)
  • 0f925d1: 8266015: Implement AdapterHandlerLibrary lookup fast-path for common adapters

Your commit was automatically rebased without conflicts.

Pushed as commit b823b3e.

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

@vyommani vyommani deleted the JDK-8266797 branch May 17, 2021 05:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

6 participants