You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/12/17 09:30:53 UTC
[5/5] kylin git commit: KYLIN-1226 Update default mr job conf in
release package
KYLIN-1226 Update default mr job conf in release package
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/82d5e618
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/82d5e618
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/82d5e618
Branch: refs/heads/2.x-staging
Commit: 82d5e618a8d3f010b95d5e33f504d5155f64a95d
Parents: 4931d23
Author: Yang Li <li...@apache.org>
Authored: Tue Dec 15 21:50:43 2015 +0800
Committer: Yang Li <li...@apache.org>
Committed: Thu Dec 17 16:29:03 2015 +0800
----------------------------------------------------------------------
build/conf/kylin_job_conf.xml | 9 +++++++--
.../apache/kylin/common/util/MemoryBudgetController.java | 3 +++
2 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/82d5e618/build/conf/kylin_job_conf.xml
----------------------------------------------------------------------
diff --git a/build/conf/kylin_job_conf.xml b/build/conf/kylin_job_conf.xml
index 15ea683..f02004e 100644
--- a/build/conf/kylin_job_conf.xml
+++ b/build/conf/kylin_job_conf.xml
@@ -59,13 +59,18 @@
<!--
<property>
<name>mapreduce.map.java.opts</name>
- <value>-Xmx3072m</value>
+ <value>-Xmx2500m</value>
</property>
<property>
<name>mapreduce.map.memory.mb</name>
- <value>4096</value>
+ <value>3072</value>
+ </property>
+ <property>
+ <name>mapreduce.task.io.sort.mb</name>
+ <value>200</value>
</property>
-->
+
<property>
<name>mapred.task.timeout</name>
<value>3600000</value>
http://git-wip-us.apache.org/repos/asf/kylin/blob/82d5e618/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java b/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
index 60befc7..60aa0ad 100644
--- a/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
+++ b/core-common/src/main/java/org/apache/kylin/common/util/MemoryBudgetController.java
@@ -97,6 +97,9 @@ public class MemoryBudgetController {
}
public void reserveInsist(MemoryConsumer consumer, int requestMB) {
+ if (requestMB > totalBudgetMB)
+ throw new NotEnoughBudgetException();
+
long waitStart = 0;
while (true) {
try {