Skip to content

Commit

Permalink
8278951: containers/cgroup/PlainRead.java fails on Ubuntu 21.10
Browse files Browse the repository at this point in the history 
Reviewed-by: hseigel, sgehwolf
  • Loading branch information
@iklam
iklam committed Jan 13, 2022
1 parent 237f861 commit 35172cd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/hotspot/os/linux/cgroupSubsystem_linux.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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); \
}
Expand Down
4 changes: 2 additions & 2 deletions src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp
View file
Original file line number Diff line number Diff line change
@@ -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
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) {
log_debug(os, container)("CPU Shares is: %d", -1);
Expand Down

5 comments on commit 35172cd

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

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

Review

Issues

@GoeLin
Copy link
Member

@GoeLin GoeLin commented on 35172cd Feb 11, 2022

Choose a reason for hiding this comment

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

/backport jdk17u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 35172cd Feb 11, 2022

Choose a reason for hiding this comment

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

@GoeLin the backport was successfully created on the branch GoeLin-backport-35172cda in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit 35172cda from the openjdk/jdk repository.

The commit being backported was authored by Ioi Lam on 13 Jan 2022 and was reviewed by Harold Seigel and Severin Gehwolf.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-35172cda:GoeLin-backport-35172cda
$ git checkout GoeLin-backport-35172cda
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev GoeLin-backport-35172cda

@jmtd
Copy link

@jmtd jmtd commented on 35172cd Apr 1, 2022

Choose a reason for hiding this comment

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

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 35172cd Apr 1, 2022

Choose a reason for hiding this comment

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

@jmtd Could not automatically backport 35172cda to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp

To manually resolve these conflicts run the following commands in your personal fork of openjdk/jdk11u-dev:

$ git checkout -b jmtd-backport-35172cda
$ git fetch --no-tags https://git.openjdk.java.net/jdk 35172cdaf38d83cd3ed57a5436bf985dde2d802b
$ git cherry-pick --no-commit 35172cdaf38d83cd3ed57a5436bf985dde2d802b
$ # Resolve conflicts
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 35172cdaf38d83cd3ed57a5436bf985dde2d802b'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 35172cdaf38d83cd3ed57a5436bf985dde2d802b.

Please sign in to comment.