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.

Sign up for GitHub

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

Jump to bottom

[fix] [broker] consider iowait as idle. #19110

Merged
merged 4 commits into from
Aug 31, 2023
Merged

[fix] [broker] consider iowait as idle. #19110

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db3be68
consider iowait as idle.
thetumbled Dec 30, 2022
452029a
fix checkstyle
thetumbled Dec 30, 2022
53c0519
add test code.
thetumbled Jan 2, 2023
d2af66c
Merge branch 'master' into fixbug_calculateCpuUsage
thetumbled Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/loadbalance/LinuxInfoUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,8 @@ public static double getCpuUsageForCGroup() {
* </pre>
* <p>
* Line is split in "words", filtering the first. The sum of all numbers give the amount of cpu cycles used this
* far. Real CPU usage should equal the sum substracting the idle cycles, this would include iowait, irq and steal.
* far. Real CPU usage should equal the sum substracting the idle cycles(that is idle+iowait), this would include
* cpu, user, nice, system, irq, softirq, steal, guest and guest_nice.
*/
public static ResourceUsage getCpuUsageForEntireHost() {
try (Stream<String> stream = Files.lines(Paths.get(PROC_STAT_PATH))) {
Expand All @@ -132,7 +133,7 @@ public static ResourceUsage getCpuUsageForEntireHost() {
.filter(s -> !s.contains("cpu"))
.mapToLong(Long::parseLong)
.sum();
long idle = Long.parseLong(words[4]);
long idle = Long.parseLong(words[4]) + Long.parseLong(words[5]);
Copy link
Contributor

Choose a reason for hiding this comment

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

It will be a little dangerous to split values directly, can it be handled by oshi library?

Copy link
Member Author

Choose a reason for hiding this comment

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

If we consider using oshi library, may be we should rewrite whole module using oshi?
oshi support for retrieving system information, such as memory and CPU usage, disks and partitions, etc.
To fix the iowait problem, a simple patch above may be a better solution.
@mattisonchao

Copy link
Member Author

Choose a reason for hiding this comment

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

The current implementation of module is splitting values directly.

long idle = Long.parseLong(words[4]);

there is no different with the patch.

long idle = Long.parseLong(words[4]) + Long.parseLong(words[5]);

I think we could fix this problem with this patch first.
WDYT. @codelipenghui

return ResourceUsage.builder()
.usage(total - idle)
.idle(idle)
Expand Down