You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/10/06 03:36:38 UTC
[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 <el...@apache.org>
Authored: Sun Oct 5 21:13:53 2014 -0400
Committer: Josh Elser <el...@apache.org>
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
[2/3] git commit: ACCUMULO-3146 Also give the tserver a bit more heap
to make sure the tserver doesn't die.
Posted by el...@apache.org.
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/master
Commit: 44bf5ed2b175cbc93ea0daf6c7c80c14b48c9fb3
Parents: 42a3fec
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 5 21:13:53 2014 -0400
Committer: Josh Elser <el...@apache.org>
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
[3/3] git commit: Merge branch '1.6'
Posted by el...@apache.org.
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1f40320
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1f40320
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d1f40320
Branch: refs/heads/master
Commit: d1f4032055752488b2717b4c088ba72f577be183
Parents: 7dea181 44bf5ed
Author: Josh Elser <el...@apache.org>
Authored: Sun Oct 5 21:36:11 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Sun Oct 5 21:36:11 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/test/functional/SimpleBalancerFairnessIT.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------