added jmxPorts to configuration, added jmx port lookup in con.factory

thelastpickle · Feb 17, 2015 · 438e329 · 438e329
1 parent 9cfc676
commit 438e329
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/src/main/java/com/spotify/reaper/ReaperApplication.java b/src/main/java/com/spotify/reaper/ReaperApplication.java
@@ -14,7 +14,6 @@
 package com.spotify.reaper;
 
 import com.google.common.annotations.VisibleForTesting;
-
 import com.spotify.reaper.cassandra.JmxConnectionFactory;
 import com.spotify.reaper.resources.ClusterResource;
 import com.spotify.reaper.resources.PingResource;
@@ -36,6 +35,7 @@
 import sun.misc.SignalHandler;
 
 import java.util.Arrays;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import io.dropwizard.Application;
@@ -109,6 +109,13 @@ public void run(ReaperApplicationConfiguration config,
       LOG.info("no JMX connection factory given in context, creating default");
       context.jmxConnectionFactory = new JmxConnectionFactory();
     }
+
+    // read jmx host/port mapping from config and provide to jmx con.factory
+    Map<String, Integer> jmxPorts = config.getJmxPorts();
+    if(jmxPorts != null) {
+        LOG.debug("Using JMX ports mapping: " + jmxPorts);
+        context.jmxConnectionFactory.setJmxPorts(jmxPorts);
+    }
 
     LOG.info("creating and registering health checks");
     // Notice that health checks are registered under the admin application on /healthcheck

diff --git a/src/main/java/com/spotify/reaper/ReaperApplicationConfiguration.java b/src/main/java/com/spotify/reaper/ReaperApplicationConfiguration.java
@@ -13,6 +13,8 @@
  */
 package com.spotify.reaper;
 
+import java.util.Map;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import org.hibernate.validator.constraints.NotEmpty;
@@ -53,6 +55,10 @@ public class ReaperApplicationConfiguration extends Configuration {
   @JsonProperty
   private DataSourceFactory database = new DataSourceFactory();
 
+  @JsonProperty
+  private Map<String, Integer> jmxPorts;
+
+
   public int getSegmentCount() {
     return segmentCount;
   }
@@ -105,4 +111,13 @@ public int getHangingRepairTimeoutMins() {
   public void setHangingRepairTimeoutMins(int hangingRepairTimeoutMins) {
     this.hangingRepairTimeoutMins = hangingRepairTimeoutMins;
   }
+
+  public Map<String, Integer> getJmxPorts() {
+    return jmxPorts;
+  }
+
+  public void setJmxPorts(Map<String, Integer> jmxPorts) {
+    this.jmxPorts = jmxPorts;
+  }
+
 }
diff --git a/src/main/java/com/spotify/reaper/cassandra/JmxConnectionFactory.java b/src/main/java/com/spotify/reaper/cassandra/JmxConnectionFactory.java
@@ -14,17 +14,22 @@
 package com.spotify.reaper.cassandra;
 
 import com.google.common.base.Optional;
-
 import com.spotify.reaper.ReaperException;
 import com.spotify.reaper.core.Cluster;
 
 import java.util.Collection;
+import java.util.Map;
 import java.util.Set;
 
 public class JmxConnectionFactory {
 
+  private Map<String, Integer> jmxPorts;
+
   public JmxProxy connect(Optional<RepairStatusHandler> handler, String host)
       throws ReaperException {
+    // use configured jmx port for host if provided
+    if(jmxPorts != null && jmxPorts.containsKey(host) && !host.contains(":"))
+        host = host + ":" + jmxPorts.get(host);
     return JmxProxy.connect(handler, host);
   }
 
@@ -48,4 +53,8 @@ public final JmxProxy connectAny(Cluster cluster)
     }
     return connectAny(Optional.<RepairStatusHandler>absent(), hosts);
   }
+
+  public void setJmxPorts(Map<String, Integer> jmxPorts) {
+    this.jmxPorts = jmxPorts;
+  }
 }