HBASE-19726 Failed to start HMaster due to infinite retrying on meta assign; ADDENDUM Fix failing TestMetaWithReplicas#testShutdownHandling; it was reading meta TableState""

Retry applying this addendum. Previous commit added it w/ wrong log
message so had to revert and then reapply here.
This commit is contained in:
Michael Stack 2018-02-03 21:49:42 -08:00
parent cd610607e7
commit 0ca7a2e916
1 changed files with 3 additions and 0 deletions

View File

@ -1109,6 +1109,9 @@ public class MetaTableAccessor {
@Nullable @Nullable
public static TableState getTableState(Connection conn, TableName tableName) public static TableState getTableState(Connection conn, TableName tableName)
throws IOException { throws IOException {
if (tableName.equals(TableName.META_TABLE_NAME)) {
return new TableState(tableName, TableState.State.ENABLED);
}
Table metaHTable = getMetaHTable(conn); Table metaHTable = getMetaHTable(conn);
Get get = new Get(tableName.getName()).addColumn(getTableFamily(), getTableStateColumn()); Get get = new Get(tableName.getName()).addColumn(getTableFamily(), getTableStateColumn());
long time = EnvironmentEdgeManager.currentTime(); long time = EnvironmentEdgeManager.currentTime();