HBASE-25648 Fix normalizer and TestSimpleRegionNormalizerOnCluster in branch-1 (#3038)

Signed-off-by: Viraj Jasani <vjasani@apache.org>
This commit is contained in:
d-c-manning 2021-03-08 22:13:10 -08:00 committed by GitHub
parent 4546163d90
commit ba80103a8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions

View File

@ -1678,7 +1678,7 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
return false;
}
if (isNormalizerOn()) {
if (!isNormalizerOn()) {
LOG.debug("Region normalization is disabled, don't run region normalizer.");
return false;
}
@ -1693,11 +1693,7 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
for (TableName table : allEnabledTables) {
final NamespaceAuditor namespaceQuotaManager = quotaManager.getNamespaceQuotaManager();
if(namespaceQuotaManager == null) {
LOG.debug("Skipping normalizing since namespace quota is null");
return false;
}
if (namespaceQuotaManager.getState(table.getNamespaceAsString()) != null) {
if (namespaceQuotaManager != null && namespaceQuotaManager.getState(table.getNamespaceAsString()) != null) {
LOG.debug("Skipping normalizing " + table + " since its namespace has quota");
continue;
}