You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2019/05/31 00:49:37 UTC
[hbase] branch branch-1.4 updated: HBASE-22451
TestLoadIncrementalHFiles and TestSecureLoadIncrementalHFiles are flaky
(#250)
This is an automated email from the ASF dual-hosted git repository.
apurtell pushed a commit to branch branch-1.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-1.4 by this push:
new 8f60ed5 HBASE-22451 TestLoadIncrementalHFiles and TestSecureLoadIncrementalHFiles are flaky (#250)
8f60ed5 is described below
commit 8f60ed5a659d55b926fedc017cf72de3884163cf
Author: Andrew Purtell <ap...@apache.org>
AuthorDate: Thu May 30 17:47:06 2019 -0700
HBASE-22451 TestLoadIncrementalHFiles and TestSecureLoadIncrementalHFiles are flaky (#250)
Start ZKNamespaceManager as first step in TableNamespaceManager initialization
Signed-off-by: Peter Somogyi <ps...@apache.org>
---
.../org/apache/hadoop/hbase/master/TableNamespaceManager.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableNamespaceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableNamespaceManager.java
index 6bcfb77..5929f26 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableNamespaceManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableNamespaceManager.java
@@ -222,14 +222,16 @@ public class TableNamespaceManager {
return true;
}
+ if (zkNamespaceManager == null) {
+ zkNamespaceManager = new ZKNamespaceManager(masterServices.getZooKeeper());
+ zkNamespaceManager.start();
+ }
+
// Now check if the table is assigned, if not then fail fast
if (isTableAssigned()) {
try {
boolean initGoodSofar = true;
nsTable = this.masterServices.getConnection().getTable(TableName.NAMESPACE_TABLE_NAME);
- zkNamespaceManager = new ZKNamespaceManager(masterServices.getZooKeeper());
- zkNamespaceManager.start();
-
if (get(nsTable, NamespaceDescriptor.DEFAULT_NAMESPACE.getName()) == null) {
if (createNamespaceAync) {
masterServices.getMasterProcedureExecutor().submitProcedure(