TAJO-1032: Improve TravisCI scripts to adjust log4j log level. (jinho) Closes #226
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/080f4e14 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/080f4e14 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/080f4e14 Branch: refs/heads/hbase_storage Commit: 080f4e1454fb8dfabe1c15e58d3c1eff8ecd6f6d Parents: a234435 Author: jhkim <[email protected]> Authored: Tue Nov 4 17:01:54 2014 +0900 Committer: jhkim <[email protected]> Committed: Tue Nov 4 17:01:54 2014 +0900 ---------------------------------------------------------------------- .travis.yml | 2 +- CHANGES | 2 ++ .../java/org/apache/tajo/TajoTestingCluster.java | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/080f4e14/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index e334a77..98dea33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,4 +36,4 @@ notifications: install: ./dev-support/travis-install-dependencies.sh -script: mvn clean install -Phcatalog-0.12.0 | grep "^Tests run:\|Running\|Results :" +script: mvn clean install -Phcatalog-0.12.0 -DLOG_LEVEL=WARN http://git-wip-us.apache.org/repos/asf/tajo/blob/080f4e14/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 9dba4d3..943869b 100644 --- a/CHANGES +++ b/CHANGES @@ -44,6 +44,8 @@ Release 0.9.1 - unreleased TASKS + TAJO-1032: Improve TravisCI scripts to adjust log4j log level. (jinho) + TAJO-1141: Refactor the packages hierarchy of tajo-client. (hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/080f4e14/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java b/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java index 452a17e..8ddc264 100644 --- a/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java +++ b/tajo-core/src/test/java/org/apache/tajo/TajoTestingCluster.java @@ -22,6 +22,7 @@ import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.io.Closeables; import com.google.common.io.Files; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.*; @@ -32,6 +33,8 @@ import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.util.ShutdownHookManager; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager; +import org.apache.log4j.Level; +import org.apache.log4j.Logger; import org.apache.tajo.catalog.*; import org.apache.tajo.catalog.proto.CatalogProtos; import org.apache.tajo.client.TajoClient; @@ -90,6 +93,12 @@ public class TajoTestingCluster { */ public Boolean isHCatalogStoreUse = false; + private static final String LOG_LEVEL; + + static { + LOG_LEVEL = System.getProperty("LOG_LEVEL"); + } + public TajoTestingCluster() { this(false); } @@ -118,6 +127,13 @@ public class TajoTestingCluster { this.standbyWorkerMode = conf.getVar(ConfVars.RESOURCE_MANAGER_CLASS) .indexOf(TajoWorkerResourceManager.class.getName()) >= 0; + + /* Since Travi CI limits the size of standard output log up to 4MB */ + if (!StringUtils.isEmpty(LOG_LEVEL)) { + Level defaultLevel = Logger.getRootLogger().getLevel(); + Logger.getLogger("org.apache.tajo").setLevel(Level.toLevel(LOG_LEVEL.toUpperCase(), defaultLevel)); + Logger.getLogger("org.apache.hadoop").setLevel(Level.toLevel(LOG_LEVEL.toUpperCase(), defaultLevel)); + } } public TajoConf getConfiguration() {
