From fbcb453ce2bbe4ffe0fa723b2ae05a7f91a6fc5d Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Sat, 3 Feb 2018 21:47:59 -0800
Subject: [PATCH] HBASE-19928 TestVisibilityLabelsOnNewVersionBehaviorTable
 fails; ADDENDUM Fix failing TestMetaWithReplicas#testShutdownHandling; it was
 reading meta TableState

---
 .../main/java/org/apache/hadoop/hbase/MetaTableAccessor.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index f80bbc04663..5dc0565162c 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -1109,6 +1109,9 @@ public class MetaTableAccessor {
   @Nullable
   public static TableState getTableState(Connection conn, TableName tableName)
       throws IOException {
+    if (tableName.equals(TableName.META_TABLE_NAME)) {
+      return new TableState(tableName, TableState.State.ENABLED);
+    }
     Table metaHTable = getMetaHTable(conn);
     Get get = new Get(tableName.getName()).addColumn(getTableFamily(), getTableStateColumn());
     long time = EnvironmentEdgeManager.currentTime();