Repository: tajo Updated Branches: refs/heads/branch-0.11.1 b198935cd -> 5f217cf8c
TAJO-2065: Increase default heap size (missing change). Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/5f217cf8 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/5f217cf8 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/5f217cf8 Branch: refs/heads/branch-0.11.1 Commit: 5f217cf8c08e4eebc7c67d2aba0e2109679db6c3 Parents: b198935 Author: Jinho Kim <[email protected]> Authored: Thu Jan 28 16:23:38 2016 +0900 Committer: Jinho Kim <[email protected]> Committed: Thu Jan 28 16:23:38 2016 +0900 ---------------------------------------------------------------------- tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java | 2 +- .../java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/5f217cf8/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java index e9e8e5b..0f80d41 100644 --- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java +++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java @@ -177,7 +177,7 @@ public class TajoConf extends Configuration { // Tajo Worker Resources WORKER_RESOURCE_AVAILABLE_CPU_CORES("tajo.worker.resource.cpu-cores", Runtime.getRuntime().availableProcessors(), Validators.min("2")), // 1qm + 1task - WORKER_RESOURCE_AVAILABLE_MEMORY_MB("tajo.worker.resource.memory-mb", 1000, Validators.min("64")), + WORKER_RESOURCE_AVAILABLE_MEMORY_MB("tajo.worker.resource.memory-mb", 1500, Validators.min("64")), WORKER_RESOURCE_AVAILABLE_DISKS("tajo.worker.resource.disks", 2, Validators.min("1")), http://git-wip-us.apache.org/repos/asf/tajo/blob/5f217cf8/tajo-core-tests/src/test/java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java ---------------------------------------------------------------------- diff --git a/tajo-core-tests/src/test/java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java b/tajo-core-tests/src/test/java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java index 328c281..22c1bff 100644 --- a/tajo-core-tests/src/test/java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java +++ b/tajo-core-tests/src/test/java/org/apache/tajo/master/scheduler/TestSimpleScheduler.java @@ -75,7 +75,7 @@ public class TestSimpleScheduler { @Before public void setup() { conf = new TajoConf(); - nodeResource = NodeResource.createResource(1500, 2, 3); + nodeResource = NodeResource.createResource(2000, 2, 3); service = new CompositeService(TestSimpleScheduler.class.getSimpleName()) { @Override
