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

8278951: containers/cgroup/PlainRead.java fails on Ubuntu 21.10 #155

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion hotspot/src/os/linux/vm/cgroupSubsystem_linux.hpp
Expand Up @@ -169,8 +169,12 @@ PRAGMA_DIAG_POP
NULL, \
scan_fmt, \
&variable); \
if (err != 0) \
if (err != 0) { \
if (PrintContainerInfo) { \
tty->print_cr(logstring, (return_type) OSCONTAINER_ERROR); \
} \
return (return_type) OSCONTAINER_ERROR; \
} \
\
if (PrintContainerInfo) { \
tty->print_cr(logstring, variable); \
Expand Down
4 changes: 2 additions & 2 deletions hotspot/src/os/linux/vm/cgroupV2Subsystem_linux.cpp
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, Red Hat Inc.
* Copyright (c) 2020, 2022, Red Hat Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -36,7 +36,7 @@
*/
int CgroupV2Subsystem::cpu_shares() {
GET_CONTAINER_INFO(int, _unified, "/cpu.weight",
"Raw value for CPU shares is: %d", "%d", shares);
"Raw value for CPU Shares is: %d", "%d", shares);
// Convert default value of 100 to no shares setup
if (shares == 100) {
if (PrintContainerInfo) {
Expand Down