From da4fd3e29b01faf6d9ac0c20933ae90808e45510 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 11 Oct 2012 06:58:07 +0000 Subject: [PATCH] HBASE-6971 .META. directory does not contain .tableinfo serialization git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1396928 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop/hbase/master/MasterFileSystem.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java index b6f1c38c83c..8a1bc465efe 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterFileSystem.java @@ -380,16 +380,12 @@ public class MasterFileSystem { if (!FSUtils.rootRegionExists(fs, rd)) { bootstrap(rd, c); } - createRootTableInfo(rd); - return rd; - } - private void createRootTableInfo(Path rd) throws IOException { - // Create ROOT tableInfo if required. - if (!FSTableDescriptors.isTableInfoExists(fs, rd, - Bytes.toString(HRegionInfo.ROOT_REGIONINFO.getTableName()))) { - FSTableDescriptors.createTableDescriptor(HTableDescriptor.ROOT_TABLEDESC, this.conf); - } + // Create tableinfo-s for ROOT and META if not already there. + FSTableDescriptors.createTableDescriptor(fs, rd, HTableDescriptor.ROOT_TABLEDESC, false); + FSTableDescriptors.createTableDescriptor(fs, rd, HTableDescriptor.META_TABLEDESC, false); + + return rd; } private static void bootstrap(final Path rd, final Configuration c)