Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D7F617BA8 for ; Wed, 29 Apr 2015 16:16:22 +0000 (UTC) Received: (qmail 17106 invoked by uid 500); 29 Apr 2015 16:16:22 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 17069 invoked by uid 500); 29 Apr 2015 16:16:22 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 17060 invoked by uid 99); 29 Apr 2015 16:16:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Apr 2015 16:16:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EC46EE0215; Wed, 29 Apr 2015 16:16:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ndimiduk@apache.org To: commits@hbase.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: Revert "HBASE-13564 Master MBeans are not published" Date: Wed, 29 Apr 2015 16:16:21 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 699460aae -> 64a42698a Revert "HBASE-13564 Master MBeans are not published" This reverts commit 2a02e679ccf95b901184afc908e49b826fc9ef55. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/64a42698 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/64a42698 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/64a42698 Branch: refs/heads/branch-1 Commit: 64a42698a6cf9dee66148a9bf6c2d69918af70dc Parents: 699460a Author: Nick Dimiduk Authored: Wed Apr 29 09:15:27 2015 -0700 Committer: Nick Dimiduk Committed: Wed Apr 29 09:15:27 2015 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/JMXListener.java | 16 ++++------------ .../org/apache/hadoop/hbase/TestJMXListener.java | 3 --- 2 files changed, 4 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/64a42698/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 0d1c7c4..d1a30e8 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,7 @@ public class JMXListener implements Coprocessor { private 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 final int defMasterRMIRegistryPort = 10101; - public static final int defRegionserverRMIRegistryPort = 10102; + public static final int defRMIRegistryPort = 10102; /** * workaround for HBASE-11146 @@ -164,17 +163,11 @@ public class JMXListener implements Coprocessor { Configuration conf = env.getConfiguration(); 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); + LOG.error("JMXListener should not be loaded in Master Environment!"); } else if (env instanceof RegionServerCoprocessorEnvironment) { - // running on RegionServer + // running on RegionServer --since 0.99 HMaster is also a HRegionServer rmiRegistryPort = - conf.getInt("regionserver" + RMI_REGISTRY_PORT_CONF_KEY, - defRegionserverRMIRegistryPort); + conf.getInt("regionserver" + RMI_REGISTRY_PORT_CONF_KEY, defRMIRegistryPort); rmiConnectorPort = conf.getInt("regionserver" + RMI_CONNECTOR_PORT_CONF_KEY, rmiRegistryPort); LOG.info("RegionServer rmiRegistryPort:" + rmiRegistryPort @@ -182,7 +175,6 @@ public class JMXListener implements Coprocessor { } else if (env instanceof RegionCoprocessorEnvironment) { LOG.error("JMXListener should not be loaded in Region Environment!"); - return; } synchronized(JMXListener.class) { http://git-wip-us.apache.org/repos/asf/hbase/blob/64a42698/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java index 510c954..af602a5 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java @@ -52,9 +52,6 @@ public class TestJMXListener { conf.set(CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY, JMXListener.class.getName()); conf.setInt("regionserver.rmi.registry.port", connectorPort); - - conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, JMXListener.class.getName()); - conf.setInt("master.rmi.registry.port", connectorPort - 1); UTIL.startMiniCluster(); }