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

Reviewed-by: hseigel, sgehwolf
This commit is contained in:
Ioi Lam 2022-01-13 18:28:03 +00:00
parent 237f861e82
commit 35172cdaf3
2 changed files with 5 additions and 3 deletions

View File

@ -157,8 +157,10 @@ PRAGMA_DIAG_POP
NULL, \
scan_fmt, \
&variable); \
if (err != 0) \
if (err != 0) { \
log_trace(os, container)(logstring, (return_type) OSCONTAINER_ERROR); \
return (return_type) OSCONTAINER_ERROR; \
} \
\
log_trace(os, container)(logstring, variable); \
}

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2021, 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
@ -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) {
log_debug(os, container)("CPU Shares is: %d", -1);