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

8254854: [cgroups v1] Metric limits not properly detected on some join controller combinations #809

Closed

Conversation

jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Oct 22, 2020

Originally only join controllers of form cpu,cpuacct would have been recognized.
However, this fails if more controllers are joined at a certain path.

The proposed fix is to be sure to split join controllers on , and set the path
accordingly. Otherwise, the Metrics system might be initialized due to some
non-join controllers, yet the limits for join controllers wouldn't be detected. A
test for this can be added once JDK-8254001 has been implemented.

Testing:

  • jdk/submit
  • container tests on Linux cgroups v1 system.

Thoughts?


Progress

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

Testing

Linux x32 Linux x64 Windows x64 macOS x64
Build ✔️ (1/1 passed) ✔️ (5/5 passed) ✔️ (2/2 passed) ✔️ (2/2 passed)
Test (tier1) ✔️ (9/9 passed) (1/9 failed) ✔️ (9/9 passed)

Failed test task

Issue

  • JDK-8254854: [cgroups v1] Metric limits not properly detected on some join controller combinations

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/809/head:pull/809
$ git checkout pull/809

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 22, 2020

👋 Welcome back sgehwolf! 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 openjdk bot added the rfr label Oct 22, 2020
@openjdk
Copy link

openjdk bot commented Oct 22, 2020

@jerboaa 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 label Oct 22, 2020
@mlbridge
Copy link

mlbridge bot commented Oct 22, 2020

Webrevs

@jerboaa
Copy link
Contributor Author

jerboaa commented Oct 22, 2020

@bobvandette Could you please take a look? It would be much appreciated.

@bobvandette
Copy link
Contributor

bobvandette commented Oct 22, 2020

How does this cgroup file get parsed properly in the hotspot side of things? I don't see more than one controller getting registered per line??? Never mind, I was looking at /proc/cgroup parsing and not /proc/self/cgroup.

// Ignore subsystems that we don't support
default:
break;
for (String cName: controllerName.split(",")) {
Copy link
Contributor

@bobvandette bobvandette Oct 22, 2020

Choose a reason for hiding this comment

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

The previous logic checked for base!=null. Do you think this is no longer necessary?

Copy link
Contributor Author

@jerboaa jerboaa Oct 22, 2020

Choose a reason for hiding this comment

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

Isn't this what line 164 does?

Copy link
Contributor

@bobvandette bobvandette Oct 22, 2020

Choose a reason for hiding this comment

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

Sorry, I missed the fact that line 164 was being retained. I just saw a lot of line removal. Looks good.

Copy link
Contributor Author

@jerboaa jerboaa Oct 22, 2020

Choose a reason for hiding this comment

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

No worries. Thank you for the review!

@openjdk
Copy link

openjdk bot commented Oct 22, 2020

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

8254854: [cgroups v1] Metric limits not properly detected on some join controller combinations

Reviewed-by: bobv

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

  • 4634dbe: 8223312: Utilize handshakes instead of is_thread_fully_suspended
  • cc50c8d: 8255196: Remove unused G1FullGCCompactionPoint::merge()
  • ae72b52: 8255047: Add HotSpot UseDebuggerErgo flags
  • 211bb62: 8255124: KeepAliveStreamCleaner may crash with java.lang.IllegalMonitorStateException: current thread is not owner
  • 299e115: 8198395: Test javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java fails in mach5
  • a5b7bc5: 7156347: javax/swing/JList/6462008/bug6462008.java fails
  • b25d894: 8252204: AArch64: Implement SHA3 accelerator/intrinsic
  • 7d3d4da: 8240709: Enable javax/swing/UI/UnninstallUIMemoryLeaks/UnninstallUIMemoryLeaks.java on all L&F
  • 5d26229: 8255174: Vector API unit tests for missed public api code coverage
  • b9186be: 6606767: resexhausted00[34] fail assert(!thread->owns_locks(), "must release all locks when leaving VM")
  • ... and 8 more: https://git.openjdk.java.net/jdk/compare/8d9e6d01fb4cfdc1d5e1bcc0f30157158b974bd3...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 openjdk bot added the ready label Oct 22, 2020
@jerboaa
Copy link
Contributor Author

jerboaa commented Oct 22, 2020

/integrate

@openjdk openjdk bot closed this Oct 22, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 22, 2020
@openjdk
Copy link

openjdk bot commented Oct 22, 2020

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

  • f279ddf: 8248411: [aarch64] Insufficient error handling when CodeBuffer is exhausted
  • 4634dbe: 8223312: Utilize handshakes instead of is_thread_fully_suspended
  • cc50c8d: 8255196: Remove unused G1FullGCCompactionPoint::merge()
  • ae72b52: 8255047: Add HotSpot UseDebuggerErgo flags
  • 211bb62: 8255124: KeepAliveStreamCleaner may crash with java.lang.IllegalMonitorStateException: current thread is not owner
  • 299e115: 8198395: Test javax/swing/plaf/metal/MetalLookAndFeel/Test8039750.java fails in mach5
  • a5b7bc5: 7156347: javax/swing/JList/6462008/bug6462008.java fails
  • b25d894: 8252204: AArch64: Implement SHA3 accelerator/intrinsic
  • 7d3d4da: 8240709: Enable javax/swing/UI/UnninstallUIMemoryLeaks/UnninstallUIMemoryLeaks.java on all L&F
  • 5d26229: 8255174: Vector API unit tests for missed public api code coverage
  • ... and 9 more: https://git.openjdk.java.net/jdk/compare/8d9e6d01fb4cfdc1d5e1bcc0f30157158b974bd3...master

Your commit was automatically rebased without conflicts.

Pushed as commit a0b687b.

💡 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
core-libs integrated
2 participants