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

[7.1.0] Fix NPE in ResourceManager when collecting local resource estimation in the profiler. #21229

Merged
merged 1 commit into from
Feb 8, 2024
Merged

[7.1.0] Fix NPE in ResourceManager when collecting local resource estimation in the profiler. #21229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions src/main/java/com/google/devtools/build/lib/actions/ResourceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,13 @@ public static ResourceManager instance() {
/** Returns prediction of RAM in Mb used by registered actions. */
@Override
public double getUsedMemoryInMb() {
return usedResources.get(ResourceSet.MEMORY);
return usedResources.getOrDefault(ResourceSet.MEMORY, 0d);
}

/** Returns prediction of CPUs used by registered actions. */
@Override
public double getUsedCPU() {
return usedResources.get(ResourceSet.CPU);
return usedResources.getOrDefault(ResourceSet.CPU, 0d);
}

// Allocated resources are allowed to go "negative", but at least
Expand Down Expand Up @@ -182,7 +182,7 @@ public double getUsedCPU() {

// Used amount of resources. Corresponds to the resource
// definition in the ResourceSet class.
private Map<String, Double> usedResources;
private Map<String, Double> usedResources = new HashMap<>();

// Used local test count. Corresponds to the local test count definition in the ResourceSet class.
private int usedLocalTestCount;
Expand Down
Loading