diff options
Diffstat (limited to 'opendc-web')
3 files changed, 7 insertions, 7 deletions
diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt index 7eb6e21f..18af0d1a 100644 --- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt +++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/OpenDCRunner.kt @@ -297,8 +297,8 @@ public class OpenDCRunner( "Success=${serviceMetrics.attemptsSuccess} " + "Failure=${serviceMetrics.attemptsFailure} " + "Error=${serviceMetrics.attemptsError} " + - "Pending=${serviceMetrics.serversPending} " + - "Active=${serviceMetrics.serversActive}" + "Pending=${serviceMetrics.tasksPending} " + + "Active=${serviceMetrics.tasksActive}" } } } diff --git a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt index 4576a463..96b42ac8 100644 --- a/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt +++ b/opendc-web/opendc-web-runner/src/main/kotlin/org/opendc/web/runner/internal/WebComputeMonitor.kt @@ -104,9 +104,9 @@ internal class WebComputeMonitor : ComputeMonitor { hostAggregateMetrics.totalPowerDraw, hostAggregateMetrics.totalFailureSlices.roundToLong(), hostAggregateMetrics.totalFailureVmSlices.roundToLong(), - serviceData.serversTotal, - serviceData.serversPending, - serviceData.serversTotal - serviceData.serversPending - serviceData.serversActive, + serviceData.tasksTotal, + serviceData.tasksPending, + serviceData.tasksTotal - serviceData.tasksPending - serviceData.tasksActive, serviceData.attemptsError + serviceData.attemptsFailure, ) } diff --git a/opendc-web/opendc-web-server/src/main/java/org/opendc/web/server/rest/SchedulerResource.java b/opendc-web/opendc-web-server/src/main/java/org/opendc/web/server/rest/SchedulerResource.java index d7bb8f69..3e839040 100644 --- a/opendc-web/opendc-web-server/src/main/java/org/opendc/web/server/rest/SchedulerResource.java +++ b/opendc-web/opendc-web-server/src/main/java/org/opendc/web/server/rest/SchedulerResource.java @@ -43,8 +43,8 @@ public final class SchedulerResource { "mem-inv", "core-mem", "core-mem-inv", - "active-servers", - "active-servers-inv", + "active-tasks", + "active-tasks-inv", "provisioned-cores", "provisioned-cores-inv", "random"); |