Index: src/contrib/hbase/conf/hbase-default.xml
===================================================================
--- src/contrib/hbase/conf/hbase-default.xml (revision 612986)
+++ src/contrib/hbase/conf/hbase-default.xml (working copy)
@@ -176,8 +176,9 @@
hbase.hregion.max.filesize
268435456
- Maximum desired file size for an HRegion. If filesize exceeds
- value + (value / 2), the HRegion is split in two. Default: 256M.
+ Maximum desired file size for any one column in an HRegion. If the size of
+ storage for a single column exceeds value + (value / 2), the HRegion is
+ split in two. Default: 256M.
Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java
===================================================================
--- src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java (revision 612986)
+++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/HMaster.java (working copy)
@@ -1036,7 +1036,8 @@
startServiceThreads();
/* Main processing loop */
try {
- for (RegionServerOperation op = null; !closed.get(); ) {
+ while (!closed.get()) {
+ RegionServerOperation op = null;
if (shutdownRequested && serversToServerInfo.size() == 0) {
startShutdown();
break;
@@ -1951,7 +1952,6 @@
private String deadServerName;
private Path oldLogDir;
private boolean logSplit;
- private boolean rootChecked;
private boolean rootRescanned;
private class ToDoEntry {
@@ -1976,7 +1976,6 @@
this.deadServer = serverInfo.getServerAddress();
this.deadServerName = this.deadServer.toString();
this.logSplit = false;
- this.rootChecked = false;
this.rootRescanned = false;
StringBuilder dirName = new StringBuilder("log_");
dirName.append(deadServer.getBindAddress());
@@ -2147,10 +2146,9 @@
@Override
protected boolean process() throws IOException {
LOG.info("process shutdown of server " + deadServer + ": logSplit: " +
- this.logSplit + ", rootChecked: " + this.rootChecked +
- ", rootRescanned: " + this.rootRescanned + ", numberOfMetaRegions: " +
- numberOfMetaRegions.get() + ", onlineMetaRegions.size(): " +
- onlineMetaRegions.size());
+ this.logSplit + ", rootRescanned: " + this.rootRescanned +
+ ", numberOfMetaRegions: " + numberOfMetaRegions.get() +
+ ", onlineMetaRegions.size(): " + onlineMetaRegions.size());
if (!logSplit) {
// Process the old log file
@@ -2167,13 +2165,11 @@
logSplit = true;
}
- if (!rootChecked) {
- if (!rootAvailable()) {
- // Return true so that worker does not put this request back on the
- // toDoQueue.
- // rootAvailable() has already put it on the delayedToDoQueue
- return true;
- }
+ if (!rootAvailable()) {
+ // Return true so that worker does not put this request back on the
+ // toDoQueue.
+ // rootAvailable() has already put it on the delayedToDoQueue
+ return true;
}
if (!rootRescanned) {
@@ -2185,15 +2181,6 @@
if (closed.get()) {
return true;
}
- if (rootRegionLocation.get() == null || !rootScanned) {
- // We can't proceed until the root region is online and has been scanned
-
- if (LOG.isDebugEnabled()) {
- LOG.debug("process server shutdown scanning root region " +
- "cancelled because rootRegionLocation is null");
- }
- return false;
- }
server = connection.getHRegionConnection(rootRegionLocation.get());
scannerId = -1L;
Index: src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegion.java
===================================================================
--- src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegion.java (revision 612986)
+++ src/contrib/hbase/src/java/org/apache/hadoop/hbase/HRegion.java (working copy)
@@ -426,7 +426,7 @@
// outstanding row locks to come in before we close so we do not drop
// outstanding updates.
waitOnRowLocks();
- LOG.debug("no more write locks outstanding on region " + regionName);
+ LOG.debug("no more row locks outstanding on region " + regionName);
if (listener != null) {
// If there is a listener, let them know that we have now