From 81d99ba35a8b6b6de79cf14ee1b8193433049640 Mon Sep 17 00:00:00 2001 From: Morten Tokle Date: Tue, 14 Nov 2017 14:02:32 +0100 Subject: Treat loadbalancer address as string and pass through --- .../yahoo/vespa/config/server/deploy/ModelContextImpl.java | 13 ++++++++----- .../vespa/config/server/modelfactory/ModelsBuilder.java | 5 ++--- .../yahoo/vespa/config/server/session/SessionPreparer.java | 3 +-- 3 files changed, 11 insertions(+), 10 deletions(-) (limited to 'configserver/src') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 1b96ba46907..8ccd6858b00 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -2,16 +2,19 @@ package com.yahoo.vespa.config.server.deploy; import com.yahoo.component.Version; -import com.yahoo.config.model.api.*; import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.FileRegistry; +import com.yahoo.config.model.api.ConfigDefinitionRepo; +import com.yahoo.config.model.api.ConfigServerSpec; +import com.yahoo.config.model.api.HostProvisioner; +import com.yahoo.config.model.api.Model; +import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.Rotation; import com.yahoo.config.provision.Zone; import java.io.File; -import java.net.URI; import java.util.List; import java.util.Optional; import java.util.Set; @@ -133,7 +136,7 @@ public class ModelContextImpl implements ModelContext { private final ApplicationId applicationId; private final boolean multitenant; private final List configServerSpecs; - private final URI loadBalancerAddress; + private final String loadBalancerAddress; private final boolean hostedVespa; private final Zone zone; private final Set rotations; @@ -141,7 +144,7 @@ public class ModelContextImpl implements ModelContext { public Properties(ApplicationId applicationId, boolean multitenant, List configServerSpecs, - URI loadBalancerAddress, + String loadBalancerAddress, boolean hostedVespa, Zone zone, Set rotations) { @@ -170,7 +173,7 @@ public class ModelContextImpl implements ModelContext { } @Override - public URI loadBalancerAddress() { + public String loadBalancerAddress() { return loadBalancerAddress; } diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java index fac73dcac77..4205a9afb79 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/modelfactory/ModelsBuilder.java @@ -6,10 +6,10 @@ import com.yahoo.config.application.api.ApplicationPackage; import com.yahoo.config.model.api.HostProvisioner; import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.model.api.ModelFactory; +import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ApplicationId; import com.yahoo.config.provision.ApplicationLockException; import com.yahoo.config.provision.OutOfCapacityException; -import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.Rotation; import com.yahoo.config.provision.Version; import com.yahoo.config.provision.Zone; @@ -19,7 +19,6 @@ import com.yahoo.vespa.config.server.deploy.ModelContextImpl; import com.yahoo.vespa.config.server.http.UnknownVespaVersionException; import com.yahoo.vespa.config.server.provision.StaticProvisioner; -import java.net.URI; import java.time.Instant; import java.util.ArrayList; import java.util.Collections; @@ -174,7 +173,7 @@ public abstract class ModelsBuilder { return new ModelContextImpl.Properties(applicationId, configserverConfig.multitenant(), ConfigServerSpec.fromConfig(configserverConfig), - URI.create(configserverConfig.loadBalancerAddress()), + configserverConfig.loadBalancerAddress(), configserverConfig.hostedVespa(), zone, rotations); diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java index 6154be52bcc..8f567ace5cc 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java @@ -35,7 +35,6 @@ import org.xml.sax.SAXException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; import java.io.IOException; -import java.net.URI; import java.time.Instant; import java.util.List; import java.util.Map; @@ -152,7 +151,7 @@ public class SessionPreparer { this.properties = new ModelContextImpl.Properties(params.getApplicationId(), configserverConfig.multitenant(), ConfigServerSpec.fromConfig(configserverConfig), - URI.create(configserverConfig.loadBalancerAddress()), + configserverConfig.loadBalancerAddress(), configserverConfig.hostedVespa(), zone, rotationsSet); -- cgit v1.2.3