From 5637e9a30bbe49e6a96cf6c85d40cf752b0d4165 Mon Sep 17 00:00:00 2001 From: Andrew Purtell Date: Wed, 29 May 2019 10:19:06 -0700 Subject: [PATCH] HBASE-22451 TestLoadIncrementalHFiles and TestSecureLoadIncrementalHFiles are flaky Start ZKNamespaceManager as first step in TableNamespaceManager initialization Signed-off-by: Peter Somogyi --- .../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 33a2fcf42670..1a58aa91e779 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 synchronized boolean isTableAvailableAndInitialized( 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(