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 5A73F10940 for ; Mon, 22 Jul 2013 18:25:08 +0000 (UTC) Received: (qmail 31702 invoked by uid 500); 22 Jul 2013 18:25:08 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 31636 invoked by uid 500); 22 Jul 2013 18:25:08 -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 31390 invoked by uid 99); 22 Jul 2013 18:25:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jul 2013 18:25:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 1742E8B0D11; Mon, 22 Jul 2013 18:25:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ecn@apache.org To: commits@accumulo.apache.org Date: Mon, 22 Jul 2013 18:25:04 -0000 Message-Id: <4db05a3a3f204cf5bc853b07ad65c015@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/5] git commit: ACCUMULO-1595 remove code to lock jvm to ram Updated Branches: refs/heads/master a943f323b -> 1a48f7c34 ACCUMULO-1595 remove code to lock jvm to ram Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b3f11559 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b3f11559 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b3f11559 Branch: refs/heads/master Commit: b3f1155962ead8af40b63c83103120ca0b82b3f2 Parents: a943f32 Author: Eric Newton Authored: Mon Jul 22 13:07:54 2013 -0400 Committer: Eric Newton Committed: Mon Jul 22 13:07:54 2013 -0400 ---------------------------------------------------------------------- .../accumulo/server/tabletserver/TabletServer.java | 15 --------------- 1 file changed, 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b3f11559/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java index ceed0ee..d83102d 100644 --- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java +++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java @@ -3036,21 +3036,6 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu clientAddress = new InetSocketAddress(hostname, 0); logger = new TabletServerLogger(this, getSystemConfiguration().getMemoryInBytes(Property.TSERV_WALOG_MAX_SIZE)); - if (getSystemConfiguration().getBoolean(Property.TSERV_LOCK_MEMORY)) { - String path = "lib/native/mlock/" + System.mapLibraryName("MLock-" + Platform.getPlatform()); - path = new File(path).getAbsolutePath(); - try { - System.load(path); - log.info("Trying to lock memory pages to RAM"); - if (MLock.lockMemoryPages() < 0) - log.error("Failed to lock memory pages to RAM"); - else - log.info("Memory pages are now locked into RAM"); - } catch (Throwable t) { - log.error("Failed to load native library for locking pages to RAM " + path + " (" + t + ")", t); - } - } - try { AccumuloVFSClassLoader.getContextManager().setContextConfig(new ContextManager.DefaultContextsConfig(new Iterable>() { @Override