diff options
author | Harald Musum <musum@yahooinc.com> | 2022-01-16 17:31:48 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-01-16 17:31:48 +0100 |
commit | 79d57272a8228e9581d887ca26ecbaa7c7816c53 (patch) | |
tree | 19e3260139825cf1f92bcdb3a8627b75e4b1f63f /configserver | |
parent | 8c23868cd630aa1241c6e26903d2b72c98862f99 (diff) |
Add converged field to ServiceListResponse
Diffstat (limited to 'configserver')
3 files changed, 6 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java index ad14cf4aab6..fc8b40777d2 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java @@ -288,12 +288,14 @@ public class ConfigConvergenceChecker extends AbstractComponent { public final URI uri; public final long wantedGeneration; public final long currentGeneration; + public final boolean converged; public ServiceListResponse(Map<ServiceInfo, Long> services, URI uri, long wantedGeneration, long currentGeneration) { services.forEach((key, value) -> this.services.add(new Service(key, value))); this.uri = uri; this.wantedGeneration = wantedGeneration; this.currentGeneration = currentGeneration; + this.converged = currentGeneration >= wantedGeneration; } public List<Service> services() { return services; } 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 0131517818d..8bd5e2bade0 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 @@ -387,7 +387,7 @@ public class ApplicationHandler extends HttpHandler { object.setString("url", response.uri.toString()); object.setLong("currentGeneration", response.currentGeneration); object.setLong("wantedGeneration", response.wantedGeneration); - object.setBool("converged", response.currentGeneration >= response.wantedGeneration); + object.setBool("converged", response.converged); } } diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java index 6afb9ef086d..0bff1642fee 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/application/ConfigConvergenceCheckerTest.java @@ -28,6 +28,7 @@ import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options import static com.yahoo.vespa.config.server.application.ConfigConvergenceChecker.ServiceListResponse; import static com.yahoo.vespa.config.server.application.ConfigConvergenceChecker.ServiceResponse; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** @@ -94,6 +95,7 @@ public class ConfigConvergenceCheckerTest { ServiceListResponse response = checker.getServiceConfigGenerations(application, requestUrl, clientTimeout); assertEquals(3, response.wantedGeneration); assertEquals(3, response.currentGeneration); + assertTrue(response.converged); List<ServiceListResponse.Service> services = response.services; assertEquals(1, services.size()); assertService(this.service, services.get(0), 3); @@ -116,6 +118,7 @@ public class ConfigConvergenceCheckerTest { ServiceListResponse response = checker.getServiceConfigGenerations(application, requestUrl, clientTimeout); assertEquals(4, response.wantedGeneration); assertEquals(3, response.currentGeneration); + assertFalse(response.converged); List<ServiceListResponse.Service> services = response.services; assertEquals(2, services.size()); |