diff options
Diffstat (limited to 'configserver')
6 files changed, 9 insertions, 4 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" diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java index fc3f55cc6aa..a10b8d9c6fb 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/filedistribution/FileDBRegistry.java @@ -61,7 +61,7 @@ public class FileDBRegistry implements FileRegistry { } private static String uriToRelativeFile(String uri) { - String relative = "uri/" + String.valueOf(XXHashFactory.nativeInstance().hash64().hash(ByteBuffer.wrap(Utf8.toBytes(uri)), 0)); + String relative = "uri/" + XXHashFactory.fastestJavaInstance().hash64().hash(ByteBuffer.wrap(Utf8.toBytes(uri)), 0); if (uri.endsWith(".json")) { relative += ".json"; } else if (uri.endsWith(".json.lz4")) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java index 7c85b51c920..07e57270dbd 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java @@ -17,6 +17,8 @@ import java.util.Set; * * @author Christian Andersen */ +// TODO Delete once YCA filter is removed +@Deprecated(forRemoval = true) public class RoutingProducer implements RoutingConfig.Producer { static final ApplicationName ROUTING_APPLICATION = ApplicationName.from("routing"); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java index 75f53667c4a..9631713c870 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/SuperModelConfigProvider.java @@ -25,8 +25,9 @@ public class SuperModelConfigProvider implements LbServicesConfig.Producer, Rout private final SuperModel superModel; private final LbServicesProducer lbProd; - private final RoutingProducer zoneProd; + @SuppressWarnings("removal") private final RoutingProducer zoneProd; + @SuppressWarnings("removal") // For RoutingProducer public SuperModelConfigProvider(SuperModel superModel, Zone zone, FlagSource flagSource) { this.superModel = superModel; this.lbProd = new LbServicesProducer(Collections.unmodifiableMap(superModel.getModelsPerTenant()), zone, flagSource); diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index 2b6ed01f09c..df5f6b00209 100644 --- a/configserver/src/main/sh/start-logd +++ b/configserver/src/main/sh/start-logd @@ -74,7 +74,7 @@ ROOT=${VESPA_HOME%/} export VESPA_CONFIG_ID="file:$VESPA_HOME/conf/logd/logd.cfg" -if [ "$multitenant" = "true" ]; then +if [ "$cloudconfig_server__multitenant" = "true" ]; then PIDFILE_LOGD=var/run/logd.pid VESPA_SERVICE_NAME=logd export VESPA_SERVICE_NAME diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java index 4d968a58bb6..c6a607f81b1 100755 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java @@ -27,6 +27,7 @@ import static org.junit.Assert.assertThat; /** * @author Christian Andersen */ +@SuppressWarnings("removal") // For RoutingProducer public class RoutingProducerTest { @Test public void testNodesFromRoutingAppOnly() throws Exception { |