Index: hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (revision 1369751) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (working copy) @@ -680,15 +680,17 @@ modTInfo = new TableInfo(tableName); Path hbaseRoot = new Path(conf.get(HConstants.HBASE_DIR)); tablesInfo.put(tableName, modTInfo); - try { - HTableDescriptor htd = - FSTableDescriptors.getTableDescriptor(hbaseRoot.getFileSystem(conf), - hbaseRoot, tableName); - modTInfo.htds.add(htd); - } catch (IOException ioe) { - LOG.error("Unable to read .tableinfo from " + hbaseRoot, ioe); - throw ioe; + HTableDescriptor htd = FSTableDescriptors.getTableDescriptor( + hbaseRoot.getFileSystem(conf), hbaseRoot, tableName); + if (htd == null + && Bytes.compareTo(Bytes.toBytes(tableName), + HConstants.ROOT_TABLE_NAME) != 0 + && Bytes.compareTo(Bytes.toBytes(tableName), + HConstants.META_TABLE_NAME) != 0) { + LOG.error("Unable to read .tableinfo from " + hbaseRoot); + throw new IOException(); } + modTInfo.htds.add(htd); } modTInfo.addRegionInfo(hbi); }