Return-Path: 
 <commits-return-23410-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3CB4A17984
	for <apmail-hbase-commits-archive@www.apache.org>;
 Wed, 18 Mar 2015 23:22:08 +0000 (UTC)
Received: (qmail 56498 invoked by uid 500); 18 Mar 2015 23:22:08 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 56367 invoked by uid 500); 18 Mar 2015 23:22:08 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 56351 invoked by uid 99); 18 Mar 2015 23:22:08 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Mar 2015 23:22:08 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id E3386E18DC; Wed, 18 Mar 2015 23:22:07 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: apurtell@apache.org
To: commits@hbase.apache.org
Date: Wed, 18 Mar 2015 23:22:08 -0000
Message-Id: <1ec8106412e04ab6bc3f5ce4e615ec49@git.apache.org>
In-Reply-To: <76dcbf53794440caa54e4ad498a60978@git.apache.org>
References: <76dcbf53794440caa54e4ad498a60978@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/2] hbase git commit: HBASE-13269 Limit result array preallocation
 to avoid OOME with large scan caching values

HBASE-13269 Limit result array preallocation to avoid OOME with large scan caching values


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8fa491e7
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8fa491e7
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8fa491e7

Branch: refs/heads/0.98
Commit: 8fa491e709770ca73701adeb474807ec87b421af
Parents: dfb015d
Author: Andrew Purtell <apurtell@apache.org>
Authored: Tue Mar 17 15:05:46 2015 -0700
Committer: Andrew Purtell <apurtell@apache.org>
Committed: Wed Mar 18 16:21:46 2015 -0700

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/regionserver/HRegionServer.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/8fa491e7/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index edb799c..2e088df 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.regionserver;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;
+import java.lang.Math;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -3237,7 +3238,9 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
           // Remove lease while its being processed in server; protects against case
           // where processing of request takes > lease expiration time.
           lease = leases.removeLease(scannerName);
-          List<Result> results = new ArrayList<Result>(rows);
+          // Limit the initial allocation of the result array to the minimum
+          // of 'rows' or 100
+          List<Result> results = new ArrayList<Result>(Math.min(rows, 100));
           long currentScanResultSize = 0;
           long totalKvSize = 0;