Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-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 CDD49187A9 for ; Tue, 22 Dec 2015 21:48:22 +0000 (UTC) Received: (qmail 19286 invoked by uid 500); 22 Dec 2015 21:48:19 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 19181 invoked by uid 500); 22 Dec 2015 21:48:19 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 18854 invoked by uid 99); 22 Dec 2015 21:48:19 -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; Tue, 22 Dec 2015 21:48:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1C71EE08EF; Tue, 22 Dec 2015 21:48:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Tue, 22 Dec 2015 21:48:22 -0000 Message-Id: <98516988ce9048418dd3281e669a1f52@git.apache.org> In-Reply-To: <0580dc0706fb4b1d89cc3b8e47dfe74f@git.apache.org> References: <0580dc0706fb4b1d89cc3b8e47dfe74f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/9] accumulo git commit: ACCUMULO-4083 Check blockcache sizes when using native maps. ACCUMULO-4083 Check blockcache sizes when using native maps. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/76cf943f Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/76cf943f Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/76cf943f Branch: refs/heads/1.6 Commit: 76cf943f73076d6c785499bf2e6454bafca2e40e Parents: 57bc207 Author: Josh Elser Authored: Tue Dec 22 15:11:59 2015 -0500 Committer: Josh Elser Committed: Tue Dec 22 15:11:59 2015 -0500 ---------------------------------------------------------------------- .../apache/accumulo/tserver/TabletServerResourceManager.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/76cf943f/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java ---------------------------------------------------------------------- diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java index 7c0eedc..ccdee32 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java @@ -166,7 +166,13 @@ public class TabletServerResourceManager { _dCache = new LruBlockCache(dCacheSize, blockSize); Runtime runtime = Runtime.getRuntime(); - if (!usingNativeMap && maxMemory + dCacheSize + iCacheSize > runtime.maxMemory()) { + if (usingNativeMap) { + // Still check block cache sizes when using native maps. + if (dCacheSize + iCacheSize > runtime.maxMemory()) { + throw new IllegalArgumentException(String.format( + "Block cache sizes %,d is too large for this JVM configuration %,d", dCacheSize + iCacheSize, runtime.maxMemory())); + } + } else if (maxMemory + dCacheSize + iCacheSize > runtime.maxMemory()) { throw new IllegalArgumentException(String.format( "Maximum tablet server map memory %,d and block cache sizes %,d is too large for this JVM configuration %,d", maxMemory, dCacheSize + iCacheSize, runtime.maxMemory()));