JDK-8273229: Update OS detection code to recognize Windows Server 2022 #5347

MBaesken · 2021-09-02T06:43:16Z

Hello, please review this small change.
The OS detection code of the JDK/JVM should recognize the new Windows server 2022 :

https://docs.microsoft.com/en-us/lifecycle/products/windows-server-2022
https://docs.microsoft.com/en-us/windows-server/get-started/windows-server-release-info

The build number of Windows server 2022 according to the documentation in the second link is 20348 .
Thanks, Matthias

Progress

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

Issue

JDK-8273229: Update OS detection code to recognize Windows Server 2022

Reviewers

Alan Bateman (@AlanBateman - Reviewer) ⚠️ Review applies to c7ce4ab
David Holmes (@dholmes-ora - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5347

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

Using diff file

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

bridgekeeper · 2021-09-02T06:43:29Z

👋 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.

openjdk · 2021-09-02T06:45:20Z

@MBaesken The following labels will be automatically applied to this pull request:

core-libs
hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

mlbridge · 2021-09-02T06:50:39Z

Webrevs

01: Full - Incremental (f8952e3e)
00: Full (c7ce4abc)

AlanBateman

The link to the "Windows Server release information" page is useful to check the build number - thanks!

openjdk · 2021-09-02T07:48:12Z

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

8273229: Update OS detection code to recognize Windows Server 2022

Reviewed-by: alanb, dholmes

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

152e669: 8273140: Replace usages of Enum.class.getEnumConstants() with Enum.values() where possible
857a930: 8263375: Support stack watermarks in Zero VM
6cfe314: 8272970: Parallelize runtime/InvocationTests/
a9a83b2: 8273256: runtime/cds/appcds/TestEpsilonGCWithCDS.java fails due to Unrecognized VM option 'ObjectAlignmentInBytes=64' on x86_32
1a5a2b6: 8271745: Correct block size for KW,KWP mode and use fixed IV for KWP mode for SunJCE
2f01a6f: 8273157: Add convenience methods to Messager
9689f61: 8272788: Nonleaf ranked locks should not be safepoint_check_never
4ee0dac: 8273248: ProblemList java/lang/instrument/BootClassPath/BootClassPathTest.sh on all configs
655ea6d: 8270489: Support archived heap objects in EpsilonGC
dacd197: 8273217: Make ParHeapInspectTask _safepoint_check_never

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.

dholmes-ora

Hi Matthias,

Some minor suggestions but okay as-is.

Thanks,
David

dholmes-ora · 2021-09-02T07:43:53Z

src/java.base/windows/native/libjava/java_props_md.c

+         * Windows Server 2022          10              0  (!VER_NT_WORKSTATION)
+         *       where (buildNumber > 20347)


There is a comment at line 392 that you may want to adjust too - perhaps just say "Windows Server 2016+" to avoid the need to keep updating it.

dholmes-ora · 2021-09-02T07:49:55Z

src/hotspot/os/windows/os_windows.cpp

+      // distinguish Windows Server 2016, 2019 and 2022 by build number
      // Windows server 2019 GA 10/2018 build number is 17763
-      if (build_number > 17762) {
+      // Windows server 2022 build number is 20348


Perhaps to avoid too much future editing:

// Distinguish Windows Server by build number:
// - 2016 GA 10/2016 build: 14393
// - 2019 GA 11/2018 build: 17763
// - 2022 GA 08/2021 build: 20348

Hi David , thanks for your suggestions. I adjusted the comments.

Best regards, Matthias

dholmes-ora

Thanks for the updates

MBaesken · 2021-09-02T11:21:32Z

/integrate

openjdk · 2021-09-02T11:22:54Z

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

0c1b16b: 8273243: Fix indentations in java.net.InetAddress methods
152e669: 8273140: Replace usages of Enum.class.getEnumConstants() with Enum.values() where possible
857a930: 8263375: Support stack watermarks in Zero VM
6cfe314: 8272970: Parallelize runtime/InvocationTests/
a9a83b2: 8273256: runtime/cds/appcds/TestEpsilonGCWithCDS.java fails due to Unrecognized VM option 'ObjectAlignmentInBytes=64' on x86_32
1a5a2b6: 8271745: Correct block size for KW,KWP mode and use fixed IV for KWP mode for SunJCE
2f01a6f: 8273157: Add convenience methods to Messager
9689f61: 8272788: Nonleaf ranked locks should not be safepoint_check_never
4ee0dac: 8273248: ProblemList java/lang/instrument/BootClassPath/BootClassPathTest.sh on all configs
655ea6d: 8270489: Support archived heap objects in EpsilonGC
... and 1 more: https://git.openjdk.java.net/jdk/compare/02822e1398d6015f0ed26edd440db8e0d50bf152...master

Your commit was automatically rebased without conflicts.

openjdk · 2021-09-02T11:23:08Z

@MBaesken Pushed as commit c2e015c.

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

JDK-8273229

c7ce4ab

openjdk bot added the rfr Pull request is ready for review label Sep 2, 2021

openjdk bot added hotspot-runtime hotspot-runtime-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Sep 2, 2021

AlanBateman approved these changes Sep 2, 2021

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Sep 2, 2021

dholmes-ora approved these changes Sep 2, 2021

View reviewed changes

Adjust comments

f8952e3

dholmes-ora approved these changes Sep 2, 2021

View reviewed changes

openjdk bot closed this Sep 2, 2021

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 Sep 2, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JDK-8273229: Update OS detection code to recognize Windows Server 2022 #5347

JDK-8273229: Update OS detection code to recognize Windows Server 2022 #5347

MBaesken commented Sep 2, 2021 •

edited by openjdk bot

Loading

bridgekeeper bot commented Sep 2, 2021

openjdk bot commented Sep 2, 2021

mlbridge bot commented Sep 2, 2021 •

edited

Loading

AlanBateman left a comment

openjdk bot commented Sep 2, 2021 •

edited

Loading

dholmes-ora left a comment

dholmes-ora Sep 2, 2021

dholmes-ora Sep 2, 2021

MBaesken Sep 2, 2021

dholmes-ora left a comment

MBaesken commented Sep 2, 2021

openjdk bot commented Sep 2, 2021

openjdk bot commented Sep 2, 2021

		* Windows Server 2022 10 0 (!VER_NT_WORKSTATION)
		* where (buildNumber > 20347)

JDK-8273229: Update OS detection code to recognize Windows Server 2022 #5347

JDK-8273229: Update OS detection code to recognize Windows Server 2022 #5347

Conversation

MBaesken commented Sep 2, 2021 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Sep 2, 2021

openjdk bot commented Sep 2, 2021

mlbridge bot commented Sep 2, 2021 • edited Loading

Webrevs

AlanBateman left a comment

Choose a reason for hiding this comment

openjdk bot commented Sep 2, 2021 • edited Loading

dholmes-ora left a comment

Choose a reason for hiding this comment

dholmes-ora Sep 2, 2021

Choose a reason for hiding this comment

dholmes-ora Sep 2, 2021

Choose a reason for hiding this comment

MBaesken Sep 2, 2021

Choose a reason for hiding this comment

dholmes-ora left a comment

Choose a reason for hiding this comment

MBaesken commented Sep 2, 2021

openjdk bot commented Sep 2, 2021

openjdk bot commented Sep 2, 2021

MBaesken commented Sep 2, 2021 •

edited by openjdk bot

Loading

mlbridge bot commented Sep 2, 2021 •

edited

Loading

openjdk bot commented Sep 2, 2021 •

edited

Loading