diff options
author | Arnstein Ressem <aressem@verizonmedia.com> | 2019-08-23 11:25:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-23 11:25:45 +0200 |
commit | 47e665c14670b193fafab3ec47e5e6ed3e13bf5e (patch) | |
tree | cb20540f2497c9bff41d25d80c42482d56ea05ff | |
parent | 944b956083270a7204396a909621756b7d7c38ca (diff) | |
parent | bfd5bcd897c04630a7feb6dbe59f53268cb40f3b (diff) |
Merge pull request #10388 from vespa-engine/revert-10370-revert-10346-revert-10336-hmusum/upgrade-to-zookeeper-3.4.14
Revert "Upgrade to zookeeper 3.4.14, take 3" MERGEOK
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java | 8 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java | 21 | ||||
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java | 15 | ||||
-rw-r--r-- | parent/pom.xml | 4 | ||||
-rw-r--r-- | zkfacade/pom.xml | 4 |
5 files changed, 31 insertions, 21 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java index d7005de5b07..3b39a85c6b1 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/Cluster.java @@ -6,18 +6,22 @@ import java.util.List; import com.google.common.collect.ImmutableList; +import edu.umd.cs.findbugs.annotations.NonNull; + /** * Model a single cluster of services in the Vespa model. * - * @author Steinar Knutsen + * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public final class Cluster implements Comparable<Cluster> { - + @NonNull public final String name; + @NonNull public final String type; /** * An ordered list of the service instances in this cluster. */ + @NonNull public final ImmutableList<Service> services; public Cluster(String name, String type, List<Service> services) { diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java index f10e2afa046..b5d18bdbb1f 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/Service.java @@ -1,31 +1,37 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.serviceview; -import com.google.common.collect.ImmutableList; -import com.yahoo.text.Utf8; - import java.math.BigInteger; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.List; +import com.google.common.collect.ImmutableList; +import com.yahoo.text.Utf8; + +import edu.umd.cs.findbugs.annotations.NonNull; + /** * Model a single service instance as a sortable object. * - * @author Steinar Knutsen + * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a> */ public final class Service implements Comparable<Service> { - + @NonNull public final String serviceType; + @NonNull public final String host; public final int statePort; + @NonNull public final String configId; + @NonNull public final List<Integer> ports; + @NonNull public final String name; public Service(String serviceType, String host, int statePort, String clusterName, String clusterType, - String configId, List<Integer> ports, String name) { + String configId, List<Integer> ports, String name) { this.serviceType = serviceType; this.host = host.toLowerCase(); this.statePort = statePort; @@ -53,7 +59,8 @@ public final class Service implements Comparable<Service> { * Generate an identifier string for one of the ports of this service * suitable for using in an URL. * - * @param port port which this identifier pertains to + * @param port + * port which this identifier pertains to * @return an opaque identifier string for this service */ public String getIdentifier(int port) { diff --git a/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java b/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java index dc6fbb7ebd3..c9574ffaa7e 100644 --- a/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java +++ b/configserver/src/main/java/com/yahoo/vespa/serviceview/ServiceModel.java @@ -1,6 +1,12 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.serviceview; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import com.google.common.collect.HashBasedTable; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -13,11 +19,7 @@ import com.yahoo.vespa.serviceview.bindings.ModelResponse; import com.yahoo.vespa.serviceview.bindings.ServicePort; import com.yahoo.vespa.serviceview.bindings.ServiceView; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import edu.umd.cs.findbugs.annotations.NonNull; import static com.yahoo.config.model.api.container.ContainerServiceType.CLUSTERCONTROLLER_CONTAINER; @@ -35,6 +37,7 @@ public final class ServiceModel { /** * An ordered list of the clusters in this config model. */ + @NonNull public final ImmutableList<Cluster> clusters; ServiceModel(ModelResponse modelConfig) { @@ -152,7 +155,7 @@ public final class ServiceModel { } } - private Service getFirstServiceInstanceByType(String typeName) { + private Service getFirstServiceInstanceByType(@NonNull String typeName) { for (Cluster c : clusters) { for (Service s : c.services) { if (typeName.equals(s.serviceType)) { diff --git a/parent/pom.xml b/parent/pom.xml index c89d53e5160..a81f64d1725 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -495,14 +495,14 @@ <artifactId>commons-pool</artifactId> <version>1.5.6</version> </dependency> - <!-- Explicitly included to get Zookeeper version 3.4.14, + <!-- Explicitly included to get Zookeeper version 3.4.13, can be excluded if you want the Zookeeper version used by curator by default --> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.14</version> + <version>3.4.13</version> </dependency> <dependency> <groupId>org.apache.curator</groupId> diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml index 2e016e71132..c57ab45e6c6 100644 --- a/zkfacade/pom.xml +++ b/zkfacade/pom.xml @@ -65,10 +65,6 @@ <version>${project.version}</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </dependency> </dependencies> <build> <plugins> |