From 2aade76735960fb41ab05f63ecb63c5548ad45f1 Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Wed, 15 Jun 2011 17:18:13 +0000
Subject: [PATCH] HBASE-451   Remove HTableDescriptor from HRegionInfo -- fix
 for TestAdmin

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1136125 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/org/apache/hadoop/hbase/master/HMaster.java | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 449fd9ee07b..1e11de52c54 100644
--- a/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -901,16 +901,10 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
     if (!isMasterRunning()) {
       throw new MasterNotRunningException();
     }
-    String tableName = hTableDescriptor.getNameAsString();
-    if(MetaReader.tableExists(catalogTracker, tableName)) {
-      throw new TableExistsException(tableName);
-    }
-
     if (cpHost != null) {
       cpHost.preCreateTable(hTableDescriptor, splitKeys);
     }
     HRegionInfo [] newRegions = getHRegionInfos(hTableDescriptor, splitKeys);
-    storeTableDescriptor(hTableDescriptor);
     int timeout = conf.getInt("hbase.client.catalog.timeout", 10000);
     // Need META availability to create a table
     try {
@@ -945,9 +939,9 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
   return hRegionInfos;
 }
 
-  private void storeTableDescriptor(HTableDescriptor hTableDescriptor) {
+  private void storeTableDescriptor(HTableDescriptor hTableDescriptor)
+      throws IOException {
     FSUtils.createTableDescriptor(hTableDescriptor, conf);
-    //fileSystemManager.createTableDescriptor(hTableDescriptor);
   }
 
   private synchronized void createTable(final HTableDescriptor hTableDescriptor,
@@ -958,6 +952,8 @@ implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
     if(MetaReader.tableExists(catalogTracker, tableName)) {
       throw new TableExistsException(tableName);
     }
+    storeTableDescriptor(hTableDescriptor);
+
     for (HRegionInfo newRegion : newRegions) {
       // 1. Set table enabling flag up in zk.
       try {