diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-11-14 21:31:20 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-14 21:31:20 +0100 |
commit | 526a2bf8da6a0d81cde6de09e1564382ee9a87f9 (patch) | |
tree | 01546b50b5c83a0502bc68c4471e688f12a579bc /configserver/src/main | |
parent | 1e19225dc03bc3e16803a67c7c31a14e62c3ec5f (diff) |
Revert "Treat loadbalancer address as string and pass through"
Diffstat (limited to 'configserver/src/main')
3 files changed, 10 insertions, 11 deletions
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 8ccd6858b00..1b96ba46907 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,19 +2,16 @@ 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; @@ -136,7 +133,7 @@ public class ModelContextImpl implements ModelContext { private final ApplicationId applicationId; private final boolean multitenant; private final List<ConfigServerSpec> configServerSpecs; - private final String loadBalancerAddress; + private final URI loadBalancerAddress; private final boolean hostedVespa; private final Zone zone; private final Set<Rotation> rotations; @@ -144,7 +141,7 @@ public class ModelContextImpl implements ModelContext { public Properties(ApplicationId applicationId, boolean multitenant, List<ConfigServerSpec> configServerSpecs, - String loadBalancerAddress, + URI loadBalancerAddress, boolean hostedVespa, Zone zone, Set<Rotation> rotations) { @@ -173,7 +170,7 @@ public class ModelContextImpl implements ModelContext { } @Override - public String loadBalancerAddress() { + public URI 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 4205a9afb79..fac73dcac77 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,6 +19,7 @@ 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; @@ -173,7 +174,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> { return new ModelContextImpl.Properties(applicationId, configserverConfig.multitenant(), ConfigServerSpec.fromConfig(configserverConfig), - configserverConfig.loadBalancerAddress(), + URI.create(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 8f567ace5cc..6154be52bcc 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,6 +35,7 @@ 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; @@ -151,7 +152,7 @@ public class SessionPreparer { this.properties = new ModelContextImpl.Properties(params.getApplicationId(), configserverConfig.multitenant(), ConfigServerSpec.fromConfig(configserverConfig), - configserverConfig.loadBalancerAddress(), + URI.create(configserverConfig.loadBalancerAddress()), configserverConfig.hostedVespa(), zone, rotationsSet); |