diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-11-11 18:35:58 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-11-11 18:35:58 +0100 |
| commit | b1076530529be8a178789476dbaf7f7b358f2214 (patch) | |
| tree | fcb40e08d80f6955b2df98cf8613dbd05acfd86c /configserver | |
| parent | fbe19e992e7cec24647f2b799d6139346dbd47d6 (diff) | |
Fix type and test pending type in handler
Diffstat (limited to 'configserver')
2 files changed, 9 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java index 3bfd44948cc..f336f183d56 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandler.java @@ -469,7 +469,7 @@ public class ApplicationHandler extends HttpHandler { .forEach(pending -> { Cursor pendingObject = pendingArray.addObject(); pendingObject.setString("type", pending.getKey()); - pendingObject.setLong("requireGeneration", pending.getValue()); + pendingObject.setLong("requiredGeneration", pending.getValue()); }); Cursor readyArray = clusterObject.setArray("ready"); diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java index 709ca35ad1c..aa98db8c2b2 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ApplicationHandlerTest.java @@ -260,6 +260,8 @@ public class ApplicationHandlerTest { assertEquals(expected, database.readReindexingStatus(applicationId).orElseThrow()); + database.writeReindexingStatus(applicationId, expected.withPending("boo", "bar", 123L)); + long now = clock.instant().toEpochMilli(); reindexing(applicationId, GET, "{" + " \"enabled\": true," + @@ -272,7 +274,12 @@ public class ApplicationHandlerTest { " \"status\": {" + " \"readyMillis\": " + (now - 1000) + " }," + - " \"pending\": []," + + " \"pending\": [" + + " {" + + " \"type\": \"bar\"," + + " \"requiredGeneration\": 123" + + " }" + + " ]," + " \"ready\": [" + " {" + " \"type\": \"bar\"," + |