Repository: hbase Updated Branches: refs/heads/branch-2 cb138c2da -> fbcb453ce
HBASE-19928 TestVisibilityLabelsOnNewVersionBehaviorTable fails; ADDENDUM Fix failing TestMetaWithReplicas#testShutdownHandling; it was reading meta TableState Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fbcb453c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fbcb453c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fbcb453c Branch: refs/heads/branch-2 Commit: fbcb453ce2bbe4ffe0fa723b2ae05a7f91a6fc5d Parents: cb138c2 Author: Michael Stack <[email protected]> Authored: Sat Feb 3 21:47:59 2018 -0800 Committer: Michael Stack <[email protected]> Committed: Sat Feb 3 21:48:18 2018 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/fbcb453c/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java ---------------------------------------------------------------------- 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 f80bbc0..5dc0565 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();
