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/15 14:50:56 UTC
kylin git commit: KYLIN-1226 Update default mr job conf in release
package
Repository: kylin
Updated Branches:
refs/heads/2.0-rc bcffcd30c -> 9a2cfd63a
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/9a2cfd63
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/9a2cfd63
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/9a2cfd63
Branch: refs/heads/2.0-rc
Commit: 9a2cfd63a59e9f32c746bd84ff26f54988019c31
Parents: bcffcd3
Author: Yang Li <li...@apache.org>
Authored: Tue Dec 15 21:50:43 2015 +0800
Committer: Yang Li <li...@apache.org>
Committed: Tue Dec 15 21:50:43 2015 +0800
----------------------------------------------------------------------
build/conf/kylin_job_conf.xml | 10 +++++++---
.../apache/kylin/common/util/MemoryBudgetController.java | 3 +++
2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/9a2cfd63/build/conf/kylin_job_conf.xml
----------------------------------------------------------------------
diff --git a/build/conf/kylin_job_conf.xml b/build/conf/kylin_job_conf.xml
index dde111a..099605f 100644
--- a/build/conf/kylin_job_conf.xml
+++ b/build/conf/kylin_job_conf.xml
@@ -69,14 +69,18 @@ limitations under the License. See accompanying LICENSE file.
<description>Block replication</description>
</property>
- <!--Properties for calculating cube by splits (in-mem), with which each Mapper need more mem to hold a full cube segment -->
+ <!-- Properties for calculating cube by splits (in-mem), with which each Mapper need more mem to hold a full cube segment -->
<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>
http://git-wip-us.apache.org/repos/asf/kylin/blob/9a2cfd63/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 3fa1574..2ffb87e 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 {