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 C032F1986C for ; Wed, 30 Mar 2016 16:01:29 +0000 (UTC) Received: (qmail 56064 invoked by uid 500); 30 Mar 2016 16:01:29 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 56028 invoked by uid 500); 30 Mar 2016 16:01:29 -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 56019 invoked by uid 99); 30 Mar 2016 16:01:29 -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, 30 Mar 2016 16:01:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7102DDFC71; Wed, 30 Mar 2016 16:01:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tedyu@apache.org To: commits@hbase.apache.org Message-Id: <62f1b0d793c64c85b550ed0d82e6c6b1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15327 Canary will always invoke admin.balancer() in each sniffing period when writeSniffing is enabled (Jianwei Cui) Date: Wed, 30 Mar 2016 16:01:29 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1.3 c33330b9d -> 07db39a02 HBASE-15327 Canary will always invoke admin.balancer() in each sniffing period when writeSniffing is enabled (Jianwei Cui) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/07db39a0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/07db39a0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/07db39a0 Branch: refs/heads/branch-1.3 Commit: 07db39a023ddb76db322cc9694d2c585644594ee Parents: c33330b Author: tedyu Authored: Wed Mar 30 09:01:08 2016 -0700 Committer: tedyu Committed: Wed Mar 30 09:01:08 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/tool/Canary.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/07db39a0/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java index f40fe53..e6c830d 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/Canary.java @@ -46,6 +46,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.AuthUtil; import org.apache.hadoop.hbase.ChoreService; +import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; @@ -924,7 +925,12 @@ public final class Canary implements Tool { admin.enableTable(writeTableName); } - int numberOfServers = admin.getClusterStatus().getServers().size(); + ClusterStatus status = admin.getClusterStatus(); + int numberOfServers = status.getServersSize(); + if (status.getServers().contains(status.getMaster())) { + numberOfServers -= 1; + } + List locations; RegionLocator locator = connection.getRegionLocator(writeTableName); try {