You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/01/29 23:18:13 UTC
svn commit: r1440183 - in /hbase/trunk:
hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: tedyu
Date: Tue Jan 29 22:18:13 2013
New Revision: 1440183
URL: http://svn.apache.org/viewvc?rev=1440183&view=rev
Log:
HBASE-7706 Remove reservation blocks from region server (Ted Yu)
Modified:
hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1440183&r1=1440182&r2=1440183&view=diff
==============================================================================
--- hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java (original)
+++ hbase/trunk/hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java Tue Jan 29 22:18:13 2013
@@ -287,9 +287,6 @@ public final class HConstants {
public static final boolean DEFAULT_HREGION_EDITS_REPLAY_SKIP_ERRORS =
false;
- /** Default size of a reservation block */
- public static final int DEFAULT_SIZE_RESERVATION_BLOCK = 1024 * 1024 * 5;
-
/** Maximum value length, enforced on KeyValue construction */
public static final int MAXIMUM_VALUE_LENGTH = Integer.MAX_VALUE - 1;
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1440183&r1=1440182&r2=1440183&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Jan 29 22:18:13 2013
@@ -342,13 +342,6 @@ public class HRegionServer implements C
/** region server configuration name */
public static final String REGIONSERVER_CONF = "regionserver_conf";
- /*
- * Space is reserved in HRS constructor and then released when aborting to
- * recover from an OOME. See HBASE-706. TODO: Make this percentage of the heap
- * or a minimum.
- */
- private final LinkedList<byte[]> reservedSpace = new LinkedList<byte[]>();
-
private MetricsRegionServer metricsRegionServer;
/*
@@ -728,10 +721,6 @@ public class HRegionServer implements C
try {
initializeZooKeeper();
initializeThreads();
- int nbBlocks = conf.getInt("hbase.regionserver.nbreservationblocks", 4);
- for (int i = 0; i < nbBlocks; i++) {
- reservedSpace.add(new byte[HConstants.DEFAULT_SIZE_RESERVATION_BLOCK]);
- }
} catch (Throwable t) {
// Call stop if error or process will stick around for ever since server
// puts up non-daemon threads.
@@ -1735,7 +1724,6 @@ public class HRegionServer implements C
LOG.fatal(msg);
}
this.abortRequested = true;
- this.reservedSpace.clear();
// HBASE-4014: show list of coprocessors that were loaded to help debug
// regionserver crashes.Note that we're implicitly using
// java.util.HashSet's toString() method to print the coprocessor names.