Author: stack
Date: Mon Apr 2 20:30:27 2012
New Revision: 1308535
URL: http://svn.apache.org/viewvc?rev=1308535&view=rev
Log:
HBASE-5693 When creating a region, the master initializes it and creates a
memstore within the master server
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java?rev=1308535&r1=1308534&r2=1308535&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/handler/CreateTableHandler.java
Mon Apr 2 20:30:27 2012
@@ -150,7 +150,7 @@ public class CreateTableHandler extends
// 1. Create HRegion
HRegion region = HRegion.createHRegion(newRegion,
this.fileSystemManager.getRootDir(), this.conf,
- this.hTableDescriptor, hlog);
+ this.hTableDescriptor, hlog, false);
if (hlog == null) {
hlog = region.getLog();
}
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1308535&r1=1308534&r2=1308535&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
Mon Apr 2 20:30:27 2012
@@ -3596,6 +3596,7 @@ public class HRegion implements HeapSize
* @param conf
* @param hTableDescriptor
* @param hlog shared HLog
+ * @param boolean initialize - true to initialize the region
* @return new HRegion
*
* @throws IOException
@@ -3603,7 +3604,8 @@ public class HRegion implements HeapSize
public static HRegion createHRegion(final HRegionInfo info, final Path
rootDir,
final Configuration conf,
final HTableDescriptor hTableDescriptor,
- final HLog hlog)
+ final HLog hlog,
+ final boolean initialize)
throws IOException {
LOG.info("creating HRegion " + info.getTableNameAsString()
+ " HTD == " + hTableDescriptor + " RootDir = " + rootDir +
@@ -3621,10 +3623,20 @@ public class HRegion implements HeapSize
}
HRegion region = HRegion.newHRegion(tableDir,
effectiveHLog, fs, conf, info, hTableDescriptor, null);
- region.initialize();
+ if (initialize) {
+ region.initialize();
+ }
return region;
}
+ public static HRegion createHRegion(final HRegionInfo info, final Path
rootDir,
+ final Configuration conf,
+ final HTableDescriptor hTableDescriptor,
+ final HLog hlog)
+ throws IOException {
+ return createHRegion(info, rootDir, conf, hTableDescriptor, hlog, true);
+ }
+
/**
* Open a Region.
* @param info Info for region to be opened.
