remove obsolete numberOfSlaves() in MesosClusterConfig.Builder

ContainerSolutions · Oct 13, 2015 · 3c5480f · 3c5480f
1 parent 9c8cf2a
commit 3c5480f
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 19 deletions.
diff --git a/docs/index.md b/docs/index.md
@@ -29,7 +29,6 @@ In this snippet we're configuring the Mesos cluster to start 3 slaves with diffe
 public class MesosClusterTest {
     @ClassRule
     public static MesosCluster cluster = new MesosCluster(MesosClusterConfig.builder()
-            .numberOfSlaves(3)
             .slaveResources(new String[]{"ports(*):[9200-9200,9300-9300]","ports(*):[9201-9201,9301-9301]","ports(*):[9202-9202,9302-9302]"})
             .build());
             

diff --git a/src/main/java/com/containersol/minimesos/main/Main.java b/src/main/java/com/containersol/minimesos/main/Main.java
@@ -62,7 +62,6 @@ private static void doUp() {
         } else {
             MesosCluster cluster = new MesosCluster(
                     MesosClusterConfig.builder()
-                            .numberOfSlaves(1)
                             .slaveResources(new String[]{"ports(*):[9200-9200,9300-9300]"})
                             .mesosImageTag(commandUp.getMesosImageTag())
                             .build()

diff --git a/src/main/java/com/containersol/minimesos/mesos/MesosClusterConfig.java b/src/main/java/com/containersol/minimesos/mesos/MesosClusterConfig.java
@@ -51,7 +51,6 @@ public static Builder builder() {
     public static class Builder {
 
         DockerClient dockerClient;
-        int numberOfSlaves = 3;
         String[] slaveResources = new String[]{};
         Integer mesosMasterPort = 5050;
         String zkUrl = null;
@@ -69,11 +68,6 @@ public Builder dockerClient(DockerClient dockerClient) {
             return this;
         }
 
-        public Builder numberOfSlaves(int numberOfSlaves) {
-            this.numberOfSlaves = numberOfSlaves;
-            return this;
-        }
-
         public Builder slaveResources(String[] slaveResources) {
             this.slaveResources = slaveResources;
             return this;
@@ -116,14 +110,6 @@ public Builder defaultDockerClient() {
 
         public MesosClusterConfig build() {
 
-            if (numberOfSlaves <= 0) {
-                throw new IllegalStateException("At least one slave is required to run a mesos cluster");
-            }
-
-            if (slaveResources.length != numberOfSlaves) {
-                throw new IllegalStateException("Please provide one resource config for each slave");
-            }
-
             if (dockerClient == null) {
                 defaultDockerClient();
                 if (dockerClient == null) {
@@ -135,11 +121,12 @@ public MesosClusterConfig build() {
                 zkUrl = "mesos";
             }
 
-            return new MesosClusterConfig(dockerClient, numberOfSlaves, slaveResources, mesosMasterPort, extraEnvironmentVariables, zkUrl, mesosMasterImage, mesosSlaveImage, mesosImageTag);
+            return new MesosClusterConfig(dockerClient, slaveResources.length, slaveResources, mesosMasterPort, extraEnvironmentVariables, zkUrl, mesosMasterImage, mesosSlaveImage, mesosImageTag);
         }
     }
 
     public int getNumberOfSlaves() {
         return numberOfSlaves;
     }
+
 }
diff --git a/src/main/java/com/containersol/minimesos/mesos/ZooKeeper.java b/src/main/java/com/containersol/minimesos/mesos/ZooKeeper.java
@@ -8,7 +8,7 @@
 public class ZooKeeper extends AbstractContainer {
 
     private static final String MESOS_LOCAL_IMAGE = "jplock/zookeeper";
-    public static final String REGISTRY_TAG = "3.4.5";
+    public static final String REGISTRY_TAG = "latest";
 
     private final String clusterId;
 

diff --git a/src/test/java/com/containersol/minimesos/MesosClusterTest.java b/src/test/java/com/containersol/minimesos/MesosClusterTest.java
@@ -31,7 +31,6 @@ public class MesosClusterTest {
     @ClassRule
     public static final MesosCluster cluster = new MesosCluster(
         MesosClusterConfig.builder()
-            .numberOfSlaves(3)
             .zkUrl("mesos")
             .slaveResources(new String[]{
                     "ports(*):[9201-9201, 9301-9301]; cpus(*):0.2; mem(*):256; disk(*):200",