summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-12-30 16:53:22 +0100
committerJon Bratseth <bratseth@gmail.com>2022-12-30 16:53:22 +0100
commitff6072e6659dc32d1f9372c4ac6a467a28e9d790 (patch)
tree094f5382c4a7ff8b3b4bf12e40f6b31609fd6414 /controller-server
parent883fc5d14297385116d303d19bed6d8009535954 (diff)
Remove unused values
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java2
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/response/application.json12
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java4
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json4
4 files changed, 5 insertions, 17 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 2fffdc25875..fcf7aaf0a82 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -1357,8 +1357,6 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
clusterObject.setString("autoscalingStatusCode", cluster.autoscalingStatusCode());
clusterObject.setString("autoscalingStatus", cluster.autoscalingStatus());
clusterObject.setLong("scalingDuration", cluster.scalingDuration().toMillis());
- clusterObject.setDouble("maxQueryGrowthRate", cluster.maxQueryGrowthRate());
- clusterObject.setDouble("currentQueryFractionOfMax", cluster.currentQueryFractionOfMax());
}
return new SlimeJsonResponse(slime);
}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/response/application.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/response/application.json
index e4d0de9eb9f..4cc2ac8c47f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/response/application.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/application/response/application.json
@@ -56,9 +56,7 @@
"architecture": "x86_64"
}
},
- "scalingDuration": 400000,
- "maxQueryGrowthRate": 0.7,
- "currentQueryFractionOfMax": 0.3
+ "scalingDuration": 400000
},
"logserver": {
"type": "admin",
@@ -114,9 +112,7 @@
"architecture": "x86_64"
}
},
- "scalingDuration": 90000,
- "maxQueryGrowthRate": 0.7,
- "currentQueryFractionOfMax": 0.3
+ "scalingDuration": 90000
},
"music": {
"type": "content",
@@ -172,9 +168,7 @@
"architecture": "x86_64"
}
},
- "scalingDuration": 1000000,
- "maxQueryGrowthRate": 0.7,
- "currentQueryFractionOfMax": 0.3
+ "scalingDuration": 1000000
}
}
} \ No newline at end of file
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index f576c90e195..badf7832ccb 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -127,9 +127,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
Optional.of(Instant.ofEpochMilli(2234)))),
"ideal",
"Cluster is ideally scaled",
- Duration.ofMinutes(6),
- 0.7,
- 0.3);
+ Duration.ofMinutes(6));
nodeRepository.putApplication(zone,
new com.yahoo.vespa.hosted.controller.api.integration.configserver.Application(application,
List.of(cluster)));
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
index 6527237840e..238368260eb 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/application-clusters.json
@@ -96,9 +96,7 @@
],
"autoscalingStatusCode": "ideal",
"autoscalingStatus": "Cluster is ideally scaled",
- "scalingDuration": 360000,
- "maxQueryGrowthRate": 0.7,
- "currentQueryFractionOfMax": 0.3
+ "scalingDuration": 360000
}
}
}