Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1440007) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy) @@ -342,13 +342,6 @@ /** 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 reservedSpace = new LinkedList(); - private MetricsRegionServer metricsRegionServer; /* @@ -728,10 +721,6 @@ 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 @@ 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. Index: hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java =================================================================== --- hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java (revision 1440007) +++ hbase-common/src/main/java/org/apache/hadoop/hbase/HConstants.java (working copy) @@ -287,9 +287,6 @@ 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;