Repository: kylin Updated Branches: refs/heads/2.0-rc 71c8033c4 -> 0cd6bbbf6
KYLIN-1268 Move logs to KYLIN_HOME/logs/ Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/0cd6bbbf Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/0cd6bbbf Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/0cd6bbbf Branch: refs/heads/2.0-rc Commit: 0cd6bbbf634492832849f37e662aa004d0b4f9ca Parents: 71c8033 Author: Li, Yang <yang...@ebay.com> Authored: Thu Dec 31 16:29:31 2015 +0800 Committer: Li, Yang <yang...@ebay.com> Committed: Thu Dec 31 16:29:31 2015 +0800 ---------------------------------------------------------------------- .../kylin/common/util/LogTitlePrinter.java | 31 -------------------- .../kylin/job/execution/AbstractExecutable.java | 6 ++-- .../mr/invertedindex/InvertedIndexJob.java | 2 +- .../kylin/engine/mr/steps/MergeCuboidJob.java | 2 +- server/pom.xml | 5 ++++ .../org/apache/kylin/rest/util/QueryUtil.java | 19 ++++-------- .../resources/kylin-server-log4j.properties | 12 +++----- .../cardinality/HiveColumnCardinalityJob.java | 4 +-- .../HiveColumnCardinalityUpdateJob.java | 6 ++-- .../storage/hbase/ii/IICreateHTableJob.java | 4 +-- 10 files changed, 25 insertions(+), 66 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/0cd6bbbf/core-common/src/main/java/org/apache/kylin/common/util/LogTitlePrinter.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/LogTitlePrinter.java b/core-common/src/main/java/org/apache/kylin/common/util/LogTitlePrinter.java deleted file mode 100644 index f7d3a16..0000000 --- a/core-common/src/main/java/org/apache/kylin/common/util/LogTitlePrinter.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.apache.kylin.common.util; - -/** - */ -public class LogTitlePrinter { - public static void printTitle(String title) { - String leftAlignFormat = "| %-100s | %n"; - - System.out.format("+------------------------------------------------------------------------------------------------------+%n"); - System.out.format(leftAlignFormat, title); - System.out.format("+------------------------------------------------------------------------------------------------------+%n"); - } -} http://git-wip-us.apache.org/repos/asf/kylin/blob/0cd6bbbf/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java ---------------------------------------------------------------------- diff --git a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java index 18d3193..e1d7106 100644 --- a/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java +++ b/core-job/src/main/java/org/apache/kylin/job/execution/AbstractExecutable.java @@ -28,7 +28,6 @@ import java.util.UUID; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.kylin.common.KylinConfig; -import org.apache.kylin.common.util.LogTitlePrinter; import org.apache.kylin.common.util.MailService; import org.apache.kylin.job.exception.ExecuteException; import org.apache.kylin.job.impl.threadpool.DefaultContext; @@ -97,8 +96,7 @@ public abstract class AbstractExecutable implements Executable, Idempotent { @Override public final ExecuteResult execute(ExecutableContext executableContext) throws ExecuteException { - //print a eye-catching title in log - LogTitlePrinter.printTitle(this.getName()); + logger.info("Executing >>>>>>>>>>>>> " + this.getName() + " <<<<<<<<<<<<<"); Preconditions.checkArgument(executableContext instanceof DefaultContext); ExecuteResult result; @@ -269,7 +267,7 @@ public abstract class AbstractExecutable implements Executable, Idempotent { protected final void addExtraInfo(String key, String value) { executableManager.addJobInfo(getId(), key, value); } - + protected final Map<String, String> getExtraInfo() { return executableManager.getOutput(getId()).getExtra(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/0cd6bbbf/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/InvertedIndexJob.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/InvertedIndexJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/InvertedIndexJob.java index 5191aca..27505e6 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/InvertedIndexJob.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/invertedindex/InvertedIndexJob.java @@ -65,7 +65,7 @@ public class InvertedIndexJob extends AbstractHadoopJob { // ---------------------------------------------------------------------------- - System.out.println("Starting: " + job.getJobName()); + logger.info("Starting: " + job.getJobName()); IIInstance ii = getII(iiname); short sharding = ii.getDescriptor().getSharding(); http://git-wip-us.apache.org/repos/asf/kylin/blob/0cd6bbbf/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeCuboidJob.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeCuboidJob.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeCuboidJob.java index 3d92a85..2ca7bb5 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeCuboidJob.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/steps/MergeCuboidJob.java @@ -52,7 +52,7 @@ public class MergeCuboidJob extends CuboidJob { // start job String jobName = getOptionValue(OPTION_JOB_NAME); - System.out.println("Starting: " + jobName); + logger.info("Starting: " + jobName); job = Job.getInstance(getConf(), jobName); setJobClasspath(job); http://git-wip-us.apache.org/repos/asf/kylin/blob/0cd6bbbf/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 3990dc1..a2c3c1f 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -121,6 +121,11 @@ <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> + <dependency> + <groupId>com.thetransactioncompany</groupId> + <artifactId>cors-filter</artifactId> + <version>1.3.2</version> + </dependency> <dependency> <groupId>log4j</groupId> http://git-wip-us.apache.org/repos/asf/kylin/blob/0cd6bbbf/server/src/main/java/org/apache/kylin/rest/util/QueryUtil.java ---------------------------------------------------------------------- diff --git a/server/src/main/java/org/apache/kylin/rest/util/QueryUtil.java b/server/src/main/java/org/apache/kylin/rest/util/QueryUtil.java index a08d2bd..5f87e8d 100644 --- a/server/src/main/java/org/apache/kylin/rest/util/QueryUtil.java +++ b/server/src/main/java/org/apache/kylin/rest/util/QueryUtil.java @@ -18,7 +18,6 @@ package org.apache.kylin.rest.util; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.HashSet; import java.util.LinkedList; @@ -29,13 +28,15 @@ import java.util.regex.Pattern; import org.apache.kylin.rest.model.SelectedColumnMeta; import org.apache.kylin.rest.request.SQLRequest; import org.apache.kylin.rest.response.SQLResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** - * @author xduo - * */ public class QueryUtil { + protected static final Logger logger = LoggerFactory.getLogger(QueryUtil.class); + private static final String S0 = "\\s*"; private static final String S1 = "\\s"; private static final String SM = "\\s+"; @@ -156,17 +157,11 @@ public class QueryUtil { String[] tokens = sql.split("[\r\n\t \\(\\)]"); for (int i = 0; i < tableauTestQueries.length; ++i) { if (isTokenWiseEqual(tokens, tableauTestQueriesInToken.get(i))) { - printInfo("Hit fake response " + i); + logger.info("Hit fake response " + i); return fakeResponses[i]; } } - // if(sql.trim().endsWith("LIMIT 1")) - // { - // //queries end with LIMIT 1 is test queries sent by Tableau - // return temp; - // } - return null; } @@ -212,8 +207,4 @@ public class QueryUtil { return true; } - private static void printInfo(String info) { - System.out.println(new Timestamp(System.currentTimeMillis()) + " - " + info); - } - } http://git-wip-us.apache.org/repos/asf/kylin/blob/0cd6bbbf/server/src/main/resources/kylin-server-log4j.properties ---------------------------------------------------------------------- diff --git a/server/src/main/resources/kylin-server-log4j.properties b/server/src/main/resources/kylin-server-log4j.properties index f4df80d..c8d2022 100644 --- a/server/src/main/resources/kylin-server-log4j.properties +++ b/server/src/main/resources/kylin-server-log4j.properties @@ -18,19 +18,19 @@ #define appenders log4j.appender.file=org.apache.log4j.DailyRollingFileAppender log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.File=${catalina.home}/logs/kylin.log +log4j.appender.file.File=${catalina.home}/../logs/kylin.log log4j.appender.file.layout.ConversionPattern=[%t]:[%d{yyyy-MM-dd HH:mm:ss,SSS}][%p][%l] - %m%n log4j.appender.file.Append=true log4j.appender.query=org.apache.log4j.DailyRollingFileAppender log4j.appender.query.layout=org.apache.log4j.PatternLayout -log4j.appender.query.File=${catalina.home}/logs/kylin_query.log +log4j.appender.query.File=${catalina.home}/../logs/kylin_query.log log4j.appender.query.layout.ConversionPattern=[%t]:[%d{yyyy-MM-dd HH:mm:ss,SSS}][%p][%l] - %m%n log4j.appender.query.Append=true log4j.appender.job=org.apache.log4j.DailyRollingFileAppender log4j.appender.job.layout=org.apache.log4j.PatternLayout -log4j.appender.job.File=${catalina.home}/logs/kylin_job.log +log4j.appender.job.File=${catalina.home}/../logs/kylin_job.log log4j.appender.job.layout.ConversionPattern=[%t]:[%d{yyyy-MM-dd HH:mm:ss,SSS}][%p][%l] - %m%n log4j.appender.job.Append=true @@ -38,6 +38,7 @@ log4j.appender.job.Append=true log4j.rootLogger=INFO,file log4j.logger.org.apache.kylin=DEBUG log4j.logger.org.springframework=WARN +log4j.logger.org.springframework.security=INFO #query config log4j.logger.org.apache.kylin.rest.controller.QueryController=DEBUG, query @@ -49,8 +50,3 @@ log4j.logger.org.apache.kylin.query=DEBUG, query log4j.logger.org.apache.kylin.rest.controller.JobController=DEBUG, job log4j.logger.org.apache.kylin.rest.service.JobService=DEBUG, job log4j.logger.org.apache.kylin.job=DEBUG, job - -#spring security config -log4j.logger.org.springframework.security=INFO,file -log4j.logger.org.opensaml=INFO,file -log4j.logger.PROTOCOL_MESSAGE=INFO,file http://git-wip-us.apache.org/repos/asf/kylin/blob/0cd6bbbf/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityJob.java ---------------------------------------------------------------------- diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityJob.java b/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityJob.java index c66d713..2b35755 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityJob.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityJob.java @@ -63,7 +63,7 @@ public class HiveColumnCardinalityJob extends AbstractHadoopJob { // start job String jobName = JOB_TITLE + getOptionsAsString(); - System.out.println("Starting: " + jobName); + logger.info("Starting: " + jobName); Configuration conf = getConf(); job = Job.getInstance(conf, jobName); @@ -93,7 +93,7 @@ public class HiveColumnCardinalityJob extends AbstractHadoopJob { this.deletePath(job.getConfiguration(), output); - System.out.println("Going to submit HiveColumnCardinalityJob for table '" + table + "'"); + logger.info("Going to submit HiveColumnCardinalityJob for table '" + table + "'"); int result = waitForCompletion(job); return result; http://git-wip-us.apache.org/repos/asf/kylin/blob/0cd6bbbf/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityUpdateJob.java ---------------------------------------------------------------------- diff --git a/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityUpdateJob.java b/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityUpdateJob.java index 86ce9d1..d088bfa 100644 --- a/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityUpdateJob.java +++ b/source-hive/src/main/java/org/apache/kylin/source/hive/cardinality/HiveColumnCardinalityUpdateJob.java @@ -73,7 +73,7 @@ public class HiveColumnCardinalityUpdateJob extends AbstractHadoopJob { this.table = getOptionValue(OPTION_TABLE).toUpperCase(); // start job String jobName = JOB_TITLE + getOptionsAsString(); - System.out.println("Starting: " + jobName); + logger.info("Starting: " + jobName); Configuration conf = getConf(); Path output = new Path(getOptionValue(OPTION_OUTPUT_PATH)); @@ -92,7 +92,7 @@ public class HiveColumnCardinalityUpdateJob extends AbstractHadoopJob { columns = readLines(new Path(outPath), config); } catch (Exception e) { e.printStackTrace(); - System.out.println("Failed to resolve cardinality for " + tableName + " from " + outPath); + logger.info("Failed to resolve cardinality for " + tableName + " from " + outPath); return; } @@ -103,7 +103,7 @@ public class HiveColumnCardinalityUpdateJob extends AbstractHadoopJob { String[] ss = StringUtils.split(string, "\t"); if (ss.length != 2) { - System.out.println("The hadoop cardinality value is not valid " + string); + logger.info("The hadoop cardinality value is not valid " + string); continue; } cardi.append(ss[1]); http://git-wip-us.apache.org/repos/asf/kylin/blob/0cd6bbbf/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHTableJob.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHTableJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHTableJob.java index bcfe346..9c96f21 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHTableJob.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/ii/IICreateHTableJob.java @@ -131,10 +131,10 @@ public class IICreateHTableJob extends AbstractHadoopJob { admin.createTable(tableDesc, splitKeys); if (splitKeys != null) { for (int i = 0; i < splitKeys.length; i++) { - System.out.println("split key " + i + ": " + BytesUtil.toHex(splitKeys[i])); + logger.info("split key " + i + ": " + BytesUtil.toHex(splitKeys[i])); } } - System.out.println("create hbase table " + tableName + " done."); + logger.info("create hbase table " + tableName + " done."); return 0; } catch (Exception e) {
