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 B3EE618A53 for ; Thu, 25 Jun 2015 10:35:48 +0000 (UTC) Received: (qmail 67074 invoked by uid 500); 25 Jun 2015 10:35:48 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 67035 invoked by uid 500); 25 Jun 2015 10:35:48 -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 67026 invoked by uid 99); 25 Jun 2015 10:35:48 -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; Thu, 25 Jun 2015 10:35:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7619DDFF09; Thu, 25 Jun 2015 10:35:48 +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: <61806f46dbe24e61a51f5278ea277178@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-13964 Skip region normalization for tables under namespace quota Date: Thu, 25 Jun 2015 10:35:48 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1.2 bc7dfe9ed -> c680e2f40 HBASE-13964 Skip region normalization for tables under namespace quota Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/c680e2f4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/c680e2f4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/c680e2f4 Branch: refs/heads/branch-1.2 Commit: c680e2f40927407a0699b0b1ce687867bc2bb398 Parents: bc7dfe9 Author: tedyu Authored: Thu Jun 25 03:35:43 2015 -0700 Committer: tedyu Committed: Thu Jun 25 03:35:43 2015 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 7 ++++++- .../org/apache/hadoop/hbase/namespace/NamespaceAuditor.java | 6 +----- 2 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/c680e2f4/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index b282676..3955211 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -1321,7 +1321,12 @@ public class HMaster extends HRegionServer implements MasterServices, Server { Collections.shuffle(allEnabledTables); - for(TableName table : allEnabledTables) { + for (TableName table : allEnabledTables) { + if (quotaManager.getNamespaceQuotaManager() != null && + quotaManager.getNamespaceQuotaManager().getState(table.getNamespaceAsString()) != null){ + LOG.debug("Skipping normalizing " + table + " since its namespace has quota"); + continue; + } if (table.isSystemTable() || !getTableDescriptors().get(table).isNormalizationEnabled()) { LOG.debug("Skipping normalization for table: " + table + ", as it's either system" + " table or doesn't have auto normalization turned on"); http://git-wip-us.apache.org/repos/asf/hbase/blob/c680e2f4/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java index 2d8529a..7956e48 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/namespace/NamespaceAuditor.java @@ -24,8 +24,6 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.master.MasterServices; import org.apache.hadoop.hbase.quotas.QuotaExceededException; -import com.google.common.annotations.VisibleForTesting; - /** * The Class NamespaceAuditor performs checks to ensure operations like table creation and region * splitting preserve namespace quota. The namespace quota can be specified while namespace @@ -131,12 +129,10 @@ public class NamespaceAuditor { } /** - * Used only for unit tests. * @param namespace The name of the namespace * @return An instance of NamespaceTableAndRegionInfo */ - @VisibleForTesting - NamespaceTableAndRegionInfo getState(String namespace) { + public NamespaceTableAndRegionInfo getState(String namespace) { if (stateManager.isInitialized()) { return stateManager.getState(namespace); }