[hbase] branch branch-1 updated: HBASE-22451 TestLoadIncrementalHFiles and TestSecureLoadIncrementalHFiles are flaky (#250)

[ap...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

apurtell pushed a commit to branch branch-1
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-1 by this push:
     new 5beba8f  HBASE-22451 TestLoadIncrementalHFiles and TestSecureLoadIncrementalHFiles are flaky (#250)
5beba8f is described below

commit 5beba8fd4e30f7b85e5e896d6a5d4662178a92df
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 33a2fcf..1a58aa9 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
@@ -235,14 +235,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(