minor, better logging messages
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/d6801695 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/d6801695 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/d6801695 Branch: refs/heads/KYLIN-1726 Commit: d6801695240f5191716aec4cbd336470281fb20f Parents: 01d033f Author: Li Yang <liy...@apache.org> Authored: Thu Sep 8 17:02:17 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu Sep 8 17:02:28 2016 +0800 ---------------------------------------------------------------------- build/bin/setenv.sh | 2 +- .../java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java | 2 +- .../java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java | 2 +- .../java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java | 4 ++-- .../org/apache/kylin/storage/hbase/util/ZookeeperJobLock.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/d6801695/build/bin/setenv.sh ---------------------------------------------------------------------- diff --git a/build/bin/setenv.sh b/build/bin/setenv.sh index d486672..317005b 100755 --- a/build/bin/setenv.sh +++ b/build/bin/setenv.sh @@ -20,7 +20,7 @@ # (if your're deploying KYLIN on a powerful server and want to replace the default conservative settings) # uncomment following to for it to take effect export KYLIN_JVM_SETTINGS="-Xms1024M -Xmx4096M -Xss256K -XX:MaxPermSize=128M -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:$KYLIN_HOME/logs/kylin.gc.$$ -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=64M" -# export KYLIN_JVM_SETTINGS="-Xms16g -Xmx16g -XX:MaxPermSize=512m -XX:NewSize=3g -XX:MaxNewSize=3g -XX:SurvivorRatio=4 -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:CMSInitiatingOccupancyFraction=70 -XX:+DisableExplicitGC" +# export KYLIN_JVM_SETTINGS="-Xms16g -Xmx16g -XX:MaxPermSize=512m -XX:NewSize=3g -XX:MaxNewSize=3g -XX:SurvivorRatio=4 -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:CMSInitiatingOccupancyFraction=70 -XX:+DisableExplicitGC -XX:+HeapDumpOnOutOfMemoryError" # uncomment following to for it to take effect(the values need adjusting to fit your env) # export KYLIN_DEBUG_SETTINGS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false" http://git-wip-us.apache.org/repos/asf/kylin/blob/d6801695/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java index 33b6f29..0b4ae40 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder.java @@ -56,7 +56,7 @@ public class BatchMergeJobBuilder extends JobBuilderSupport { final String cuboidRootPath = getCuboidRootPath(jobId); final List<CubeSegment> mergingSegments = cubeSegment.getCubeInstance().getMergingSegments(cubeSegment); - Preconditions.checkState(mergingSegments.size() > 1, "there should be more than 2 segments to merge"); + Preconditions.checkState(mergingSegments.size() > 1, "there should be more than 2 segments to merge, target segment " + cubeSegment); final List<String> mergingSegmentIds = Lists.newArrayList(); final List<String> mergingCuboidPaths = Lists.newArrayList(); for (CubeSegment merging : mergingSegments) { http://git-wip-us.apache.org/repos/asf/kylin/blob/d6801695/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java index 289cd48..129d525 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/BatchMergeJobBuilder2.java @@ -48,7 +48,7 @@ public class BatchMergeJobBuilder2 extends JobBuilderSupport { final String jobId = result.getId(); final List<CubeSegment> mergingSegments = cubeSegment.getCubeInstance().getMergingSegments(cubeSegment); - Preconditions.checkState(mergingSegments.size() > 1, "there should be more than 2 segments to merge"); + Preconditions.checkState(mergingSegments.size() > 1, "there should be more than 2 segments to merge, target segment " + cubeSegment); final List<String> mergingSegmentIds = Lists.newArrayList(); for (CubeSegment merging : mergingSegments) { mergingSegmentIds.add(merging.getUuid()); http://git-wip-us.apache.org/repos/asf/kylin/blob/d6801695/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java index 1bd052d..7c2b3fd 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseMRSteps.java @@ -169,7 +169,7 @@ public class HBaseMRSteps extends JobBuilderSupport { public List<String> getMergingHTables() { final List<CubeSegment> mergingSegments = ((CubeInstance) seg.getRealization()).getMergingSegments((CubeSegment) seg); - Preconditions.checkState(mergingSegments.size() > 1, "there should be more than 2 segments to merge"); + Preconditions.checkState(mergingSegments.size() > 1, "there should be more than 2 segments to merge, target segment " + seg); final List<String> mergingHTables = Lists.newArrayList(); for (CubeSegment merging : mergingSegments) { mergingHTables.add(merging.getStorageLocationIdentifier()); @@ -179,7 +179,7 @@ public class HBaseMRSteps extends JobBuilderSupport { public List<String> getMergingHDFSPaths() { final List<CubeSegment> mergingSegments = ((CubeInstance) seg.getRealization()).getMergingSegments((CubeSegment) seg); - Preconditions.checkState(mergingSegments.size() > 1, "there should be more than 2 segments to merge"); + Preconditions.checkState(mergingSegments.size() > 1, "there should be more than 2 segments to merge, target segment " + seg); final List<String> mergingHDFSPaths = Lists.newArrayList(); for (CubeSegment merging : mergingSegments) { mergingHDFSPaths.add(getJobWorkingDir(merging.getLastBuildJobID())); http://git-wip-us.apache.org/repos/asf/kylin/blob/d6801695/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperJobLock.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperJobLock.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperJobLock.java index 729635b..bdd3981 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperJobLock.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/ZookeeperJobLock.java @@ -73,7 +73,7 @@ public class ZookeeperJobLock implements JobLock { logger.warn("error acquire lock", e); } if (!hasLock) { - logger.warn("fail to acquire lock, scheduler has not been started"); + logger.warn("fail to acquire lock, scheduler has not been started; maybe another kylin process is still running?"); zkClient.close(); return false; }
