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 DD1D417981 for ; Mon, 6 Oct 2014 01:36:38 +0000 (UTC) Received: (qmail 98721 invoked by uid 500); 6 Oct 2014 01:36:38 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 98677 invoked by uid 500); 6 Oct 2014 01:36:38 -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 98658 invoked by uid 99); 6 Oct 2014 01:36:38 -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, 06 Oct 2014 01:36:38 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7C46581ACAD; Mon, 6 Oct 2014 01:36:38 +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: Mon, 06 Oct 2014 01:36:38 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: ACCUMULO-3146 Also give the tserver a bit more heap to make sure the tserver doesn't die. Repository: accumulo Updated Branches: refs/heads/1.6 42a3fec7a -> 44bf5ed2b refs/heads/master 7dea18104 -> d1f403205 ACCUMULO-3146 Also give the tserver a bit more heap to make sure the tserver doesn't die. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/44bf5ed2 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/44bf5ed2 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/44bf5ed2 Branch: refs/heads/1.6 Commit: 44bf5ed2b175cbc93ea0daf6c7c80c14b48c9fb3 Parents: 42a3fec Author: Josh Elser Authored: Sun Oct 5 21:13:53 2014 -0400 Committer: Josh Elser Committed: Sun Oct 5 21:13:53 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/test/functional/SimpleBalancerFairnessIT.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/44bf5ed2/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java index 7d37615..966c150 100644 --- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java +++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java @@ -36,6 +36,8 @@ import org.apache.accumulo.core.master.thrift.TableInfo; import org.apache.accumulo.core.master.thrift.TabletServerStatus; import org.apache.accumulo.core.security.Credentials; import org.apache.accumulo.core.util.UtilWaitThread; +import org.apache.accumulo.minicluster.MemoryUnit; +import org.apache.accumulo.minicluster.ServerType; import org.apache.accumulo.minicluster.impl.MiniAccumuloConfigImpl; import org.apache.accumulo.test.TestIngest; import org.apache.accumulo.trace.instrument.Tracer; @@ -51,6 +53,7 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacIT { siteConfig.put(Property.TSERV_MAXMEM.getKey(), "10K"); siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "0"); cfg.setSiteConfig(siteConfig); + cfg.setMemory(ServerType.TABLET_SERVER, cfg.getMemory(ServerType.TABLET_SERVER) * 3, MemoryUnit.BYTE); } @Override