diff options
author | Morten Tokle <morten.tokle@gmail.com> | 2017-11-16 19:00:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-16 19:00:44 +0100 |
commit | 9a7bbe64b2e0403651c06ddf7dc6ac841165433a (patch) | |
tree | 797fc2b68976a28ff60e506dae31c9c574d209ca /configserver | |
parent | 4b547d35f10f2c5c70a620131f1fad9343e89878 (diff) | |
parent | 32ec23d54aad2a32584446470faaa33e76cd773e (diff) |
Merge pull request #4145 from vespa-engine/mortent/add-lbaddress-name
Add new field for loadbalancername, deprecate loadbalanceraddress
Diffstat (limited to 'configserver')
3 files changed, 16 insertions, 12 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 1b96ba46907..c0c9c309576 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,20 @@ 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.HostName; 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 +137,7 @@ public class ModelContextImpl implements ModelContext { private final ApplicationId applicationId; private final boolean multitenant; private final List<ConfigServerSpec> configServerSpecs; - private final URI loadBalancerAddress; + private final HostName loadBalancerName; private final boolean hostedVespa; private final Zone zone; private final Set<Rotation> rotations; @@ -141,14 +145,14 @@ public class ModelContextImpl implements ModelContext { public Properties(ApplicationId applicationId, boolean multitenant, List<ConfigServerSpec> configServerSpecs, - URI loadBalancerAddress, + HostName loadBalancerName, boolean hostedVespa, Zone zone, Set<Rotation> rotations) { this.applicationId = applicationId; this.multitenant = multitenant; this.configServerSpecs = configServerSpecs; - this.loadBalancerAddress = loadBalancerAddress; + this.loadBalancerName = loadBalancerName; this.hostedVespa = hostedVespa; this.zone = zone; this.rotations = rotations; @@ -170,8 +174,8 @@ public class ModelContextImpl implements ModelContext { } @Override - public URI loadBalancerAddress() { - return loadBalancerAddress; + public HostName loadBalancerName() { + return loadBalancerName; } @Override 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..d869b5a2901 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,11 @@ 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.HostName; 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 +20,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 +174,7 @@ public abstract class ModelsBuilder<MODELRESULT extends ModelResult> { return new ModelContextImpl.Properties(applicationId, configserverConfig.multitenant(), ConfigServerSpec.fromConfig(configserverConfig), - URI.create(configserverConfig.loadBalancerAddress()), + HostName.from(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..531085883c4 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 @@ -11,6 +11,7 @@ import com.yahoo.config.model.api.ConfigDefinitionRepo; import com.yahoo.config.model.api.ModelContext; import com.yahoo.config.provision.AllocatedHosts; import com.yahoo.config.provision.ApplicationId; +import com.yahoo.config.provision.HostName; import com.yahoo.config.provision.OutOfCapacityException; import com.yahoo.config.provision.Rotation; import com.yahoo.config.provision.Version; @@ -35,7 +36,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 +152,7 @@ public class SessionPreparer { this.properties = new ModelContextImpl.Properties(params.getApplicationId(), configserverConfig.multitenant(), ConfigServerSpec.fromConfig(configserverConfig), - URI.create(configserverConfig.loadBalancerAddress()), + HostName.from(configserverConfig.loadBalancerAddress()), configserverConfig.hostedVespa(), zone, rotationsSet); |