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

8306281: function isWsl() returns false on WSL2 #14413

Closed

Conversation

Domest0s
Copy link
Contributor

@Domest0s Domest0s commented Jun 12, 2023

Currently isWsl() function is looking for "Microsoft" string in the kernel release string ($ uname -r).
That's not always true. Namely, on Ubuntu 22.04 - currently the newest Ubuntu LTS and default OS for WSL in Microsoft Store. In there $ uname -r command outputs "5.10.102.1-microsoft-standard-WSL2".
This makes isWsl() function to return false in such environments and breaks JDK builds on WSL.

To correct that I made the substring search case-insensitive.


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

Issue

  • JDK-8306281: function isWsl() returns false on WSL2 (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/14413/head:pull/14413
$ git checkout pull/14413

Update a local copy of the PR:
$ git checkout pull/14413
$ git pull https://git.openjdk.org/jdk.git pull/14413/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14413

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/14413.diff

Webrev

Link to Webrev Comment

@bridgekeeper bridgekeeper bot added the oca Needs verification of OCA signatory status label Jun 12, 2023
@bridgekeeper
Copy link

bridgekeeper bot commented Jun 12, 2023

Hi @Domest0s, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user Domest0s" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@openjdk
Copy link

openjdk bot commented Jun 12, 2023

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

  • build

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 build build-dev@openjdk.org label Jun 12, 2023
@Domest0s
Copy link
Contributor Author

/covered

@bridgekeeper bridgekeeper bot added the oca-verify Needs verification of OCA signatory status label Jun 12, 2023
@bridgekeeper
Copy link

bridgekeeper bot commented Jun 12, 2023

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

@bridgekeeper bridgekeeper bot removed oca Needs verification of OCA signatory status oca-verify Needs verification of OCA signatory status labels Jun 12, 2023
@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 12, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 12, 2023

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 12, 2023

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

8306281: function isWsl() returns false on WSL2

Reviewed-by: erikj

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

  • c884862: 8309468: Remove jvmti Allocate locker test case
  • 05f896a: 8309862: Unsafe list operations in JfrStringPool
  • 4f23fc1: 8309671: Avoid using jvmci.Compiler property to determine if Graal is enabled
  • 1a9edb8: 8309838: Classfile API Util.toBinaryName and other cleanup
  • f7de726: 8295555: Primitive wrapper caches could be @Stable
  • 5d71612: 8309852: G1: Remove unnecessary assert_empty in G1ParScanThreadStateSet destructor
  • 23a54f3: 8309538: G1: Move total collection increment from Cleanup to Remark
  • 57fc9a3: 8309763: Move tests in test/jdk/sun/misc/URLClassPath directory to test/jdk/jdk/internal/loader
  • 2dca5ae: 8299052: ViewportOverlapping test fails intermittently on Win10 & Win11
  • 3028295: 8309065: Move the logic to determine archive heap location from CDS to G1 GC
  • ... and 15 more: https://git.openjdk.org/jdk/compare/408cadb351eb3b3a96e81e26e1c39c89dac176ca...master

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@erikj79) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 12, 2023
@Domest0s
Copy link
Contributor Author

Thanks, @erikj79 for reviewing.

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 13, 2023
@openjdk
Copy link

openjdk bot commented Jun 13, 2023

@Domest0s
Your change (at version a3c662e) is now ready to be sponsored by a Committer.

@erikj79
Copy link
Member

erikj79 commented Jun 13, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 13, 2023

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

  • c884862: 8309468: Remove jvmti Allocate locker test case
  • 05f896a: 8309862: Unsafe list operations in JfrStringPool
  • 4f23fc1: 8309671: Avoid using jvmci.Compiler property to determine if Graal is enabled
  • 1a9edb8: 8309838: Classfile API Util.toBinaryName and other cleanup
  • f7de726: 8295555: Primitive wrapper caches could be @Stable
  • 5d71612: 8309852: G1: Remove unnecessary assert_empty in G1ParScanThreadStateSet destructor
  • 23a54f3: 8309538: G1: Move total collection increment from Cleanup to Remark
  • 57fc9a3: 8309763: Move tests in test/jdk/sun/misc/URLClassPath directory to test/jdk/jdk/internal/loader
  • 2dca5ae: 8299052: ViewportOverlapping test fails intermittently on Win10 & Win11
  • 3028295: 8309065: Move the logic to determine archive heap location from CDS to G1 GC
  • ... and 15 more: https://git.openjdk.org/jdk/compare/408cadb351eb3b3a96e81e26e1c39c89dac176ca...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 13, 2023

@erikj79 @Domest0s Pushed as commit 9b0baa1.

💡 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
build build-dev@openjdk.org integrated Pull request has been integrated
2 participants