diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-04-25 10:35:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-25 10:35:22 +0200 |
| commit | 55f1cf267369fa1c88631bf994a02fc0b77a0660 (patch) | |
| tree | d9b4fbfdef2f7de5a3a20aaff6610547d849765c /configserver | |
| parent | 87d6ec65f1bf6b83dd72160cea49850819192288 (diff) | |
| parent | 056726cac143425c990d955432c1cb2c2107e7af (diff) | |
Merge pull request #9006 from vespa-engine/revert-9005-revert-8986-hmusum/check-config-convergence-for-logserver-container
Revert "Revert "Check logserver container for config convergence""
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/application/ConfigConvergenceChecker.java | 3 |
1 files changed, 2 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 877b2acb86f..4fbda42fdc7 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 @@ -32,6 +32,7 @@ import java.util.Set; import java.util.stream.Collectors; import static com.yahoo.config.model.api.container.ContainerServiceType.CONTAINER; +import static com.yahoo.config.model.api.container.ContainerServiceType.LOGSERVER_CONTAINER; import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER; /** @@ -43,12 +44,12 @@ import static com.yahoo.config.model.api.container.ContainerServiceType.QRSERVER public class ConfigConvergenceChecker extends AbstractComponent { private static final ApplicationId routingApplicationId = ApplicationId.from("hosted-vespa", "routing", "default"); - private static final String nodeAdminName = "node-admin"; private static final String statePath = "/state/v1/"; private static final String configSubPath = "config"; private final static Set<String> serviceTypesToCheck = new HashSet<>(Arrays.asList( CONTAINER.serviceName, QRSERVER.serviceName, + LOGSERVER_CONTAINER.serviceName, "searchnode", "storagenode", "distributor" |