Allow to configure a custom JMX port per cluster

Adding a cluster to Reaper now takes a jmx port parameter which will be stored in the backend for that cluster.
All JMX connection now require a full Cluster object to build the Node instance that is passed to the JmxConnectionFactory so we can get the custom port for that cluster.
The integration tests have been modified so that node 127.0.0.1 jmx port is now removed from the yaml file and the cluster is registered with port 7100.
The other nodes JMX ports are still in the yaml file and will prevail over the cluster's custom JMX port.
Make the partitioner optional in the Cluster object

Author: adejanovski

src/packaging/bin/spreaper

@@ -171,6 +171,7 @@ def _arguments_for_status_schedule(parser):
 def _arguments_for_add_cluster(parser):
     """Arguments relevant for registering a cluster"""
     parser.add_argument("seed_host", help="the seed host of the Cassandra cluster to be registered")
+    parser.add_argument("jmx_port", help="the JMX port of the Cassandra cluster to be registered", default="7199")
 
 
 def _argument_owner(parser):
@@ -596,8 +597,8 @@ class ReaperCLI(object):
             "Register a cluster.",
             extra_arguments=_arguments_for_add_cluster
         )
-        printq("# Registering Cassandra cluster with seed host: {0}".format(args.seed_host))
-        cluster_data = reaper.post("cluster", seedHost=args.seed_host)
+        printq("# Registering Cassandra cluster with seed host: {0} and jmx port : {1}".format(args.seed_host, args.jmx_port))
+        cluster_data = reaper.post("cluster", seedHost=args.seed_host, jmxPort=args.jmx_port)
         printq("# Registration succeeded:")
         print json.dumps(json.loads(cluster_data), indent=2, sort_keys=True)
 

src/server/src/main/java/io/cassandrareaper/ReaperApplication.java

@@ -307,7 +307,7 @@ private void schedulePurge(ScheduledExecutorService scheduler) {
           try {
             int purgedRuns = purgeManager.purgeDatabase();
             LOG.info("Purged {} repair runs from history", purgedRuns);
-          } catch (RuntimeException e) {
+          } catch (RuntimeException | ReaperException e) {
             LOG.error("Failed purging repair runs from history", e);
           }
         },
@@ -405,7 +405,7 @@ private void initializeJmxSeedsForAllClusters() {
           .forEach(cluster -> jmxConnectionsIntializer.on(cluster));
 
       LOG.info("Initialized JMX seed list for all clusters.");
-    } catch (RuntimeException e) {
+    } catch (RuntimeException | ReaperException e) {
       LOG.error("Failed initializing JMX seed list", e);
     }
   }

src/server/src/main/java/io/cassandrareaper/core/Cluster.java

@@ -17,20 +17,33 @@
 
 package io.cassandrareaper.core;
 
+import java.util.Optional;
 import java.util.Set;
 
 import com.google.common.base.Preconditions;
 
 public final class Cluster {
 
+  public static final int DEFAULT_JMX_PORT = 7199;
   private final String name;
-  private final String partitioner; // Full name of the partitioner class
+  private final Optional<String> partitioner; // Full name of the partitioner class
   private final Set<String> seedHosts;
+  private final ClusterProperties properties;
 
-  public Cluster(String name, String partitioner, Set<String> seedHosts) {
+  public Cluster(String name, Optional<String> partitioner, Set<String> seedHosts) {
+    this(
+        name,
+        partitioner,
+        seedHosts,
+        ClusterProperties.builder().withJmxPort(DEFAULT_JMX_PORT).build());
+  }
+
+  public Cluster(
+      String name, Optional<String> partitioner, Set<String> seedHosts, ClusterProperties properties) {
     this.name = toSymbolicName(name);
     this.partitioner = partitioner;
     this.seedHosts = seedHosts;
+    this.properties = properties;
   }
 
   public static String toSymbolicName(String name) {
@@ -42,11 +55,15 @@ public String getName() {
     return name;
   }
 
-  public String getPartitioner() {
+  public Optional<String> getPartitioner() {
     return partitioner;
   }
 
   public Set<String> getSeedHosts() {
     return seedHosts;
   }
+
+  public ClusterProperties getProperties() {
+    return properties;
+  }
 }

src/server/src/main/java/io/cassandrareaper/core/ClusterProperties.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014-2017 Spotify AB
+ * Copyright 2016-2018 The Last Pickle Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.cassandrareaper.core;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder;
+
+@JsonDeserialize(builder = ClusterProperties.Builder.class)
+public final class ClusterProperties {
+  private final int jmxPort;
+
+  private ClusterProperties(Builder builder) {
+    this.jmxPort = builder.jmxPort;
+  }
+
+  public int getJmxPort() {
+    return jmxPort;
+  }
+
+  public static Builder builder() {
+    return new Builder();
+  }
+
+  @JsonPOJOBuilder(buildMethodName = "build", withPrefix = "with")
+  public static final class Builder {
+    private int jmxPort;
+
+    private Builder() {}
+
+    public Builder withJmxPort(int jmxPort) {
+      this.jmxPort = jmxPort;
+      return this;
+    }
+
+    public ClusterProperties build() {
+      return new ClusterProperties(this);
+    }
+  }
+}

src/server/src/main/java/io/cassandrareaper/core/Node.java

@@ -18,6 +18,7 @@
 package io.cassandrareaper.core;
 
 import java.util.Collections;
+import java.util.Optional;
 
 public final class Node {
 
@@ -57,7 +58,7 @@ public Builder withCluster(Cluster cluster) {
     }
 
     public Builder withClusterName(String clusterName) {
-      this.cluster = new Cluster(clusterName, null, Collections.emptySet());
+      this.cluster = new Cluster(clusterName, Optional.empty(), Collections.emptySet());
       return this;
     }
 

src/server/src/main/java/io/cassandrareaper/jmx/JmxConnectionFactory.java

@@ -85,6 +85,10 @@ protected JmxProxy connectImpl(Node node, int connectionTimeout) throws ReaperEx
     String host = node.getHostname();
     if (jmxPorts != null && jmxPorts.containsKey(host) && !host.contains(":")) {
       host = host + ":" + jmxPorts.get(host);
+      LOG.debug("Connecting to {} with specific port", host);
+    } else {
+      host = host + ":" + node.getCluster().getProperties().getJmxPort();
+      LOG.debug("Connecting to {} with custom port", host);
     }
 
     String username = null;

src/server/src/main/java/io/cassandrareaper/jmx/JmxProxyImpl.java

@@ -92,8 +92,6 @@ final class JmxProxyImpl implements JmxProxy {
 
   private static final Logger LOG = LoggerFactory.getLogger(JmxProxy.class);
 
-  private static final int JMX_PORT = 7199;
-
   private static final String VALUE_ATTRIBUTE = "Value";
   private static final String FAILED_TO_CONNECT_TO_USING_JMX = "Failed to connect to {} using JMX";
   private static final String ERROR_GETTING_ATTR_JMX = "Error getting attribute from JMX";
@@ -160,13 +158,13 @@ static JmxProxy connect(
     final HostAndPort hostAndPort = HostAndPort.fromString(host);
 
     return connect(
-          hostAndPort.getHost(),
-          hostAndPort.getPortOrDefault(JMX_PORT),
-          username,
-          password,
-          addressTranslator,
-          connectionTimeout,
-          metricRegistry);
+        hostAndPort.getHost(),
+        hostAndPort.getPortOrDefault(Cluster.DEFAULT_JMX_PORT),
+        username,
+        password,
+        addressTranslator,
+        connectionTimeout,
+        metricRegistry);
   }
 
   /**