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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Better task balancing #1482

Merged
merged 73 commits into from Jun 8, 2017
Commits
Jump to file or symbol
Failed to load files and symbols.
+6 鈭6
Diff settings

Always

Just for now

Viewing a subset of changes. View all

add variables to output string

  • Loading branch information...
darcatron committed May 10, 2017
commit 3e651e1953abef65c050bf9f772f21151193cf1e
@@ -21,7 +21,7 @@
private final double cpusUsed;
private final double cpusReserved;
private final Optional<Long> memoryMbTotal;
private final Optional<Double> cpuTotal;
private final Optional<Double> cpusTotal;
private final Map<ResourceUsageType, Number> longRunningTasksUsage;
@JsonCreator
@@ -32,7 +32,7 @@ public SingularitySlaveUsage(@JsonProperty("memoryBytesUsed") long memoryBytesUs
@JsonProperty("cpusReserved") double cpusReserved,
@JsonProperty("numTasks") int numTasks,
@JsonProperty("memoryMbTotal") Optional<Long> memoryMbTotal,
@JsonProperty("cpuTotal") Optional<Double> cpuTotal,
@JsonProperty("cpusTotal") Optional<Double> cpusTotal,
@JsonProperty("longRunningTasksUsage") Map<ResourceUsageType, Number> longRunningTasksUsage) {
this.memoryBytesUsed = memoryBytesUsed;
this.memoryMbReserved = memoryMbReserved;
@@ -41,7 +41,7 @@ public SingularitySlaveUsage(@JsonProperty("memoryBytesUsed") long memoryBytesUs
this.cpusReserved = cpusReserved;
this.numTasks = numTasks;
this.memoryMbTotal = memoryMbTotal;
this.cpuTotal = cpuTotal;
this.cpusTotal = cpusTotal;
this.longRunningTasksUsage = longRunningTasksUsage;
}
@@ -77,8 +77,8 @@ public int getNumTasks() {
return memoryMbTotal.isPresent() ? Optional.of(memoryMbTotal.get()) : Optional.absent();
}
public Optional<Double> getCpuTotal() {
return cpuTotal;
public Optional<Double> getCpusTotal() {
return cpusTotal;
}
public Map<ResourceUsageType, Number> getLongRunningTasksUsage() {
@@ -87,6 +87,6 @@ public int getNumTasks() {
@Override
public String toString() {
return "SingularitySlaveUsage [memoryBytesUsed=" + memoryBytesUsed + ", numTasks=" + numTasks + ", timestamp=" + timestamp + ", cpusUsed=" + cpusUsed + "]";
return "SingularitySlaveUsage [memoryBytesUsed=" + memoryBytesUsed + ", memoryMbReserved=" + memoryMbReserved + ", memoryMbTotal=" + memoryMbTotal + ", cpusUsed=" + cpusUsed + ", cpusReserved" + cpusReserved + ", cpusTotal=" + cpusTotal + ", numTasks=" + numTasks + ", timestamp=" + timestamp + "]";
}
}
ProTip! Use n and p to navigate between commits in a pull request.