hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From apurt...@apache.org
Subject [2/2] hbase git commit: HBASE-13564 Master MBeans are not published (Ashish Singhi) + Addendum
Date Mon, 11 May 2015 23:51:14 GMT
HBASE-13564 Master MBeans are not published (Ashish Singhi) + Addendum

Amending-Author: Andrew Purtell <apurtell@apache.org>

Conflicts:
	hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/35e7870a
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/35e7870a
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/35e7870a

Branch: refs/heads/0.98
Commit: 35e7870a423f5463c0ab245f6554e26a415bb46a
Parents: fea9003
Author: stack <stack@apache.org>
Authored: Wed Apr 29 11:35:31 2015 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Mon May 11 16:48:59 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/JMXListener.java | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/35e7870a/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java
index f292d4c..b82dd13 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java
@@ -51,8 +51,8 @@ public class JMXListener implements Coprocessor {
   public static final Log LOG = LogFactory.getLog(JMXListener.class);
   public static final String RMI_REGISTRY_PORT_CONF_KEY = ".rmi.registry.port";
   public static final String RMI_CONNECTOR_PORT_CONF_KEY = ".rmi.connector.port";
-  public static int defMasterRMIRegistryPort = 10101;
-  public static int defRegionserverRMIRegistryPort = 10102;
+  public static final int defMasterRMIRegistryPort = 10101;
+  public static final int defRegionserverRMIRegistryPort = 10102;
 
   private JMXConnectorServer jmxCS = null;
 
@@ -158,13 +158,10 @@ public class JMXListener implements Coprocessor {
     if (env instanceof MasterCoprocessorEnvironment) {
       // running on Master
       rmiRegistryPort =
-        conf.getInt("master" + RMI_REGISTRY_PORT_CONF_KEY,
-        defMasterRMIRegistryPort);
-      rmiConnectorPort =
-        conf.getInt("master" + RMI_CONNECTOR_PORT_CONF_KEY, rmiRegistryPort);
-      LOG.info("Master rmiRegistryPort:" + rmiRegistryPort
-        + ",Master rmiConnectorPort:" + rmiConnectorPort);
-
+          conf.getInt("master" + RMI_REGISTRY_PORT_CONF_KEY, defMasterRMIRegistryPort);
+      rmiConnectorPort = conf.getInt("master" + RMI_CONNECTOR_PORT_CONF_KEY, rmiRegistryPort);
+      LOG.info("Master rmiRegistryPort:" + rmiRegistryPort + ", Master rmiConnectorPort:"
+          + rmiConnectorPort);
     } else if (env instanceof RegionServerCoprocessorEnvironment) {
       // running on RegionServer
       rmiRegistryPort =
@@ -173,10 +170,11 @@ public class JMXListener implements Coprocessor {
       rmiConnectorPort =
         conf.getInt("regionserver" + RMI_CONNECTOR_PORT_CONF_KEY, rmiRegistryPort);
       LOG.info("RegionServer rmiRegistryPort:" + rmiRegistryPort
-        + ",RegionServer rmiConnectorPort:" + rmiConnectorPort);
+        + ", RegionServer rmiConnectorPort:" + rmiConnectorPort);
 
     } else if (env instanceof RegionCoprocessorEnvironment) {
       LOG.error("JMXListener should not be loaded in Region Environment!");
+      return;
     }
 
     startConnectorServer(rmiRegistryPort, rmiConnectorPort);


Mime
View raw message