8343599: Kmem limit and max values swapped when printing container information #21906

SoniaZaldana · 2024-11-05T15:16:52Z

Hi all,

This is a small patch addressing 8343599.

Cheers,
Sonia

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-8343599: Kmem limit and max values swapped when printing container information (Bug - P3)

Reviewers

Stefan Johansson (@kstefanj - Reviewer)
Severin Gehwolf (@jerboaa - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21906

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…formation

bridgekeeper · 2024-11-05T15:17:56Z

👋 Welcome back szaldana! 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 · 2024-11-05T15:18:08Z

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

8343599: Kmem limit and max values swapped when printing container information

Reviewed-by: sjohanss, sgehwolf

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

9907065: 8344065: Remove SecurityManager uses from the java.datatransfer module
db56266: 8344250: Obsolete the DontYieldALot flag
7ef2633: 8344128: Regression: make help broken after JDK-8340818
d959c7d: 8344147: Remove Security Manager dependencies from java.security.sasl module
ec148c1: 8344063: Remove doPrivileged calls from swing classes in the java.desktop module
2cbce1f: 8344071: Mark some jdk/jfr/event/oldobject test flagless until they fixed to support all GC
681a57f: 8343064: ClassFormatError: Illegal class name from InnerClassLambdaMetafactory
4d4951a: 8343889: Test runtime/cds/appcds/redefineClass/RedefineBasicTest.java failed
697f27c: 8341964: Add mechanism to disable different parts of TLS cipher suite
002b985: 8342963: TestLargeStub::testUpcall doesn't test upcalls stubs
... and 170 more: https://git.openjdk.org/jdk/compare/c33a8f52b613e5eff02f572eda876cbbfc7c22cf...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.

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

openjdk · 2024-11-05T15:19:10Z

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

hotspot-runtime

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.

mlbridge · 2024-11-05T19:33:04Z

Webrevs

01: Full - Incremental (0841754f)
00: Full (ec3780cc)

kstefanj

The fix looks good. The comment about order is not a strict requirement, but I think having the same order would be nice.

kstefanj · 2024-11-06T08:14:22Z

src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp

@@ -301,8 +301,8 @@ void CgroupV1MemoryController::print_version_specific_info(outputStream* st, jul
  jlong kmem_max_usage = kernel_memory_max_usage_in_bytes();

  OSContainer::print_container_helper(st, kmem_usage, "kernel_memory_usage_in_bytes");
-  OSContainer::print_container_helper(st, kmem_limit, "kernel_memory_max_usage_in_bytes");
-  OSContainer::print_container_helper(st, kmem_max_usage, "kernel_memory_limit_in_bytes");
+  OSContainer::print_container_helper(st, kmem_limit, "kernel_memory_limit_in_bytes");


Looking at the other printouts in os::Linux::print_container_info(...) the limit is printed first, followed by usage and max usage. I think it would be good to use that order here as well to be more consistent.

jerboaa

Agree with @kstefanj to make the order more consistent. Either way a good fix. Thanks!

SoniaZaldana · 2024-11-06T15:31:25Z

Thanks @kstefanj, @jerboaa! I updated the order of the printouts.

SoniaZaldana · 2024-11-13T14:31:58Z

Hi @@kstefanj, just wondering if you could have a quick review to meet the 2 reviewer requirement :) Cheers!

kstefanj · 2024-11-15T07:07:24Z

Sorry for the wait, I thought it was enough to have one of the reviewers re-review.

SoniaZaldana · 2024-11-15T14:06:42Z

Sorry for the wait, I thought it was enough to have one of the reviewers re-review.

No worries! I wasn't sure if that was okay. Thanks @kstefanj!

SoniaZaldana · 2024-11-15T14:06:52Z

/integrate

openjdk · 2024-11-15T14:07:35Z

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

a672138: 8344161: Argument type mismatch for jfr_type_id
3245f56: 8344164: [s390x] ProblemList hotspot/jtreg/runtime/NMT/VirtualAllocCommitMerge.java
5e27608: 8344188: Cleanup sun.net.www.protocol.jar.JarFileFactory after JEP 486 integration
ba39321: 8343881: java.lang.classfile.Attribute attributeName() method should return Utf8Entry
75c651f: 8327156: Avoid copying in StringTable::intern(oop, TRAPS)
3eece6e: 8341907: javac -Xlint should ignore /// on first line of source file
5b9932f: 8338288: Compiler Implementation for Flexible Constructor Bodies (Third Preview)
0c191f6: 8344185: Remove calls to SecurityManager in sun.net.ftp
bfee766: 8344183: (zipfs) SecurityManager cleanup in the ZipFS area
857f68c: 8344179: SecurityManager cleanup in the ZIP and JAR areas
... and 182 more: https://git.openjdk.org/jdk/compare/c33a8f52b613e5eff02f572eda876cbbfc7c22cf...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-11-15T14:07:44Z

@SoniaZaldana Pushed as commit 6cdebf0.

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

8343599: Kmem limit and max values swapped when printing container in…

ec3780c

…formation

openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Nov 5, 2024

SoniaZaldana marked this pull request as ready for review November 5, 2024 19:08

openjdk bot added the rfr Pull request is ready for review label Nov 5, 2024

kstefanj approved these changes Nov 6, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 6, 2024

jerboaa approved these changes Nov 6, 2024

View reviewed changes

Fixing order of printouts

0841754

openjdk bot removed the ready Pull request is ready to be integrated label Nov 6, 2024

jerboaa approved these changes Nov 6, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 6, 2024

kstefanj approved these changes Nov 15, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Nov 15, 2024

openjdk bot closed this Nov 15, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 15, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

8343599: Kmem limit and max values swapped when printing container information #21906

8343599: Kmem limit and max values swapped when printing container information #21906

Uh oh!

SoniaZaldana commented Nov 5, 2024 •

edited by openjdk bot

Loading

Uh oh!

bridgekeeper bot commented Nov 5, 2024

Uh oh!

openjdk bot commented Nov 5, 2024 •

edited

Loading

Uh oh!

openjdk bot commented Nov 5, 2024

Uh oh!

mlbridge bot commented Nov 5, 2024 •

edited

Loading

Uh oh!

kstefanj left a comment

Uh oh!

kstefanj Nov 6, 2024

Uh oh!

jerboaa left a comment

Uh oh!

SoniaZaldana commented Nov 6, 2024

Uh oh!

SoniaZaldana commented Nov 13, 2024

Uh oh!

kstefanj commented Nov 15, 2024

Uh oh!

SoniaZaldana commented Nov 15, 2024

Uh oh!

SoniaZaldana commented Nov 15, 2024

Uh oh!

openjdk bot commented Nov 15, 2024

Uh oh!

openjdk bot commented Nov 15, 2024

Uh oh!

Uh oh!

8343599: Kmem limit and max values swapped when printing container information #21906

8343599: Kmem limit and max values swapped when printing container information #21906

Uh oh!

Conversation

SoniaZaldana commented Nov 5, 2024 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Nov 5, 2024

Uh oh!

openjdk bot commented Nov 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Nov 5, 2024

Uh oh!

mlbridge bot commented Nov 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

kstefanj left a comment

Choose a reason for hiding this comment

Uh oh!

kstefanj Nov 6, 2024

Choose a reason for hiding this comment

Uh oh!

jerboaa left a comment

Choose a reason for hiding this comment

Uh oh!

SoniaZaldana commented Nov 6, 2024

Uh oh!

SoniaZaldana commented Nov 13, 2024

Uh oh!

kstefanj commented Nov 15, 2024

Uh oh!

SoniaZaldana commented Nov 15, 2024

Uh oh!

SoniaZaldana commented Nov 15, 2024

Uh oh!

openjdk bot commented Nov 15, 2024

Uh oh!

openjdk bot commented Nov 15, 2024

Uh oh!

Uh oh!

SoniaZaldana commented Nov 5, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Nov 5, 2024 •

edited

Loading

mlbridge bot commented Nov 5, 2024 •

edited

Loading