You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2016/03/23 10:15:30 UTC
[46/50] [abbrv] kylin git commit: KYLIN-1226 use low memory config
for sandbox CI
KYLIN-1226 use low memory config for sandbox CI
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4e5a936c
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4e5a936c
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4e5a936c
Branch: refs/heads/1.5.x-HBase1.1.3
Commit: 4e5a936c22997c3ba081a229053b93ea27c7ab46
Parents: 4aeb76b
Author: Yang Li <li...@apache.org>
Authored: Sat Mar 12 11:01:12 2016 +0800
Committer: Yang Li <li...@apache.org>
Committed: Sat Mar 12 11:01:12 2016 +0800
----------------------------------------------------------------------
build/conf/kylin.properties | 2 +-
.../java/org/apache/kylin/common/KylinConfigBase.java | 12 +++++++++---
.../org/apache/kylin/rest/util/Log4jConfigListener.java | 4 +---
3 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/4e5a936c/build/conf/kylin.properties
----------------------------------------------------------------------
diff --git a/build/conf/kylin.properties b/build/conf/kylin.properties
index e87494d..68678cc 100644
--- a/build/conf/kylin.properties
+++ b/build/conf/kylin.properties
@@ -161,7 +161,7 @@ kylin.web.contact_mail=
###########################config info for front#######################
#env DEV|QA|PROD
-deploy.env=DEV
+deploy.env=QA
###########################deprecated configs#######################
kylin.sandbox=true
http://git-wip-us.apache.org/repos/asf/kylin/blob/4e5a936c/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
----------------------------------------------------------------------
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index 6a47321..e3a73e8 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -119,6 +119,10 @@ public class KylinConfigBase implements Serializable {
// ============================================================================
+ public boolean isDevEnv() {
+ return "DEV".equals(getOptional("deploy.env", "DEV"));
+ }
+
public String getMetadataUrl() {
return getOptional("kylin.metadata.url");
}
@@ -485,10 +489,12 @@ public class KylinConfigBase implements Serializable {
}
public Map<String, String> getCubingInMemMRJobConfOverride() {
- String str = getOptional("kylin.job.cubing.inmem.mrjob_conf_override", //
- "mapreduce.map.java.opts=-Xmx2700m; mapreduce.map.memory.mb=3072; mapreduce.task.io.sort.mb=200");
+ // in-mem cubing requires big memory, however dev env (sandbox) may not have that much
+ String defaultOverride = isDevEnv() ? "" : "mapreduce.map.java.opts=-Xmx2700m; mapreduce.map.memory.mb=3072; mapreduce.task.io.sort.mb=200";
+ String override = getOptional("kylin.job.cubing.inmem.mrjob_conf_override", defaultOverride);
+
Map<String, String> result = Maps.newHashMap();
- for (String pair : str.split(";")) {
+ for (String pair : override.split(";")) {
int cut = pair.indexOf('=');
if (cut < 0)
continue;
http://git-wip-us.apache.org/repos/asf/kylin/blob/4e5a936c/server/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java b/server/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java
index 23b327a..7e79511 100644
--- a/server/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java
+++ b/server/src/main/java/org/apache/kylin/rest/util/Log4jConfigListener.java
@@ -27,9 +27,7 @@ public class Log4jConfigListener extends org.springframework.web.util.Log4jConfi
private boolean isDebugTomcat;
public Log4jConfigListener() {
- // check if is DebugTomcat
- String property = System.getProperty(KylinConfig.KYLIN_CONF);
- this.isDebugTomcat = property != null && property.contains("examples/test_case_data/sandbox");
+ this.isDebugTomcat = KylinConfig.getInstanceFromEnv().isDevEnv();
}
@Override