Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id BFEDA200B35 for ; Tue, 5 Jul 2016 22:52:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BE68E160A60; Tue, 5 Jul 2016 20:52:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 1373A160A2C for ; Tue, 5 Jul 2016 22:52:40 +0200 (CEST) Received: (qmail 30650 invoked by uid 500); 5 Jul 2016 20:52:39 -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 30641 invoked by uid 99); 5 Jul 2016 20:52:39 -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; Tue, 05 Jul 2016 20:52:39 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A547CE01C1; Tue, 5 Jul 2016 20:52:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: eclark@apache.org To: commits@hbase.apache.org Message-Id: <576b2d2c21614fc19749c90118014398@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-16087 Replication shouldn't start on a master if if only hosts system tables Date: Tue, 5 Jul 2016 20:52:39 +0000 (UTC) archived-at: Tue, 05 Jul 2016 20:52:41 -0000 Repository: hbase Updated Branches: refs/heads/master 20a99b4c0 -> ae92668dd HBASE-16087 Replication shouldn't start on a master if if only hosts system tables Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ae92668d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ae92668d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ae92668d Branch: refs/heads/master Commit: ae92668dd6eff5271ceeecc435165f5fc14fab48 Parents: 20a99b4 Author: Elliott Clark Authored: Wed Jun 22 15:40:28 2016 -0700 Committer: Elliott Clark Committed: Tue Jul 5 13:50:37 2016 -0700 ---------------------------------------------------------------------- .../hadoop/hbase/master/balancer/BaseLoadBalancer.java | 13 +++++++++++++ .../hadoop/hbase/regionserver/HRegionServer.java | 6 ++++++ 2 files changed, 19 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ae92668d/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java index f52dbdf..dc5bace 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java @@ -1016,6 +1016,19 @@ public abstract class BaseLoadBalancer implements LoadBalancer { return tables != null && tables.length > 0; } + public static boolean userTablesOnMaster(Configuration conf) { + String[] tables = getTablesOnMaster(conf); + if (tables == null || tables.length == 0) { + return false; + } + for (String tn:tables) { + if (!tn.startsWith("hbase:")) { + return true; + } + } + return false; + } + @Override public void setConf(Configuration conf) { setSlop(conf); http://git-wip-us.apache.org/repos/asf/hbase/blob/ae92668d/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 1c1000e..877c3db 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -118,6 +118,7 @@ import org.apache.hadoop.hbase.ipc.ServerRpcController; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.TableLockManager; +import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer; import org.apache.hadoop.hbase.mob.MobCacheConfig; import org.apache.hadoop.hbase.procedure.RegionServerProcedureManagerHost; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; @@ -2651,6 +2652,11 @@ public class HRegionServer extends HasThread implements static private void createNewReplicationInstance(Configuration conf, HRegionServer server, FileSystem fs, Path logDir, Path oldLogDir) throws IOException{ + if ((server instanceof HMaster) && + (!BaseLoadBalancer.userTablesOnMaster(conf))) { + return; + } + // read in the name of the source replication class from the config file. String sourceClassname = conf.get(HConstants.REPLICATION_SOURCE_SERVICE_CLASSNAME, HConstants.REPLICATION_SERVICE_CLASSNAME_DEFAULT);