aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@yahooinc.com>2023-04-21 18:11:43 +0200
committerValerij Fredriksen <valerijf@yahooinc.com>2023-04-21 18:11:43 +0200
commit0badec38e79ab89b75e9911e0d9e48dfcdb31828 (patch)
tree7cbb055e21d3fe65637cd42982cd26f1fbf5cf74 /controller-server
parent2dce1d44d2260657c78fd9b030a51d86ce1b248e (diff)
Correctly count number of nodes that finished dropping documents
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/restapi/application/ApplicationApiTest.java2
2 files changed, 2 insertions, 2 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 d5029d2d8a5..af09b9dc761 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
@@ -2061,7 +2061,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
} else {
Cursor progress = root.setObject("progress");
progress.setLong("total", nodes.size());
- progress.setLong("dropped", numDropped);
+ progress.setLong("dropped", numDropped + numReadied + numStarted);
progress.setLong("started", numStarted + numNoReport);
}
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 5b75d8cb914..c6d68bc5d9d 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -549,7 +549,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
nodeRepository.putNodes(zone, List.of(nodeBuilder.apply(1, "{\"startedAt\":3}"), nodeBuilder.apply(2, "{\"readiedAt\":1}")));
tester.assertResponse(request("/application/v4/tenant/tenant2/application/application1/instance/default/environment/dev/region/us-east-1/drop-documents", GET).userIdentity(USER_ID),
- "{\"progress\":{\"total\":2,\"dropped\":0,\"started\":1}}");
+ "{\"progress\":{\"total\":2,\"dropped\":2,\"started\":1}}");
updateMetrics();