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 2016/04/26 14:53:45 UTC
[1/2] kylin git commit: KYLIN-1625 Add pid to gc log filename
Repository: kylin
Updated Branches:
refs/heads/master d5ff2db32 -> 2cd936608
KYLIN-1625 Add pid to gc log filename
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/68183a49
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/68183a49
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/68183a49
Branch: refs/heads/master
Commit: 68183a49046aed328a18c8d1ea5d11a238224943
Parents: d5ff2db
Author: lidongsjtu <li...@apache.org>
Authored: Tue Apr 26 20:41:12 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Tue Apr 26 20:41:12 2016 +0800
----------------------------------------------------------------------
build/bin/setenv.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/68183a49/build/bin/setenv.sh
----------------------------------------------------------------------
diff --git a/build/bin/setenv.sh b/build/bin/setenv.sh
index 80a2d3e..f98f3c3 100755
--- a/build/bin/setenv.sh
+++ b/build/bin/setenv.sh
@@ -19,7 +19,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 -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="-Xms1024M -Xmx4096M -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"
# uncomment following to for it to take effect(the values need adjusting to fit your env)
[2/2] kylin git commit: KYLIN-1614 Add more log files
Posted by li...@apache.org.
KYLIN-1614 Add more log files
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/2cd93660
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/2cd93660
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/2cd93660
Branch: refs/heads/master
Commit: 2cd936608f8a96e7cf886a94283fe089a74b3a80
Parents: 68183a4
Author: lidongsjtu <li...@apache.org>
Authored: Tue Apr 26 20:53:49 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Tue Apr 26 20:53:49 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/tool/DiagnosisInfoCLI.java | 32 ++++++++------------
1 file changed, 12 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/2cd93660/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java b/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
index a316773..98302ae 100644
--- a/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
+++ b/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
@@ -170,7 +170,7 @@ public class DiagnosisInfoCLI extends AbstractApplication {
logger.warn("Error in export commit id.", e);
}
- // export process info
+ // export basic info
try {
File basicDir = new File(exportDir, "basic");
FileUtils.forceMkdir(basicDir);
@@ -186,30 +186,22 @@ public class DiagnosisInfoCLI extends AbstractApplication {
if (logPeriod > 0) {
logger.info("Start to extract kylin logs in {} days", logPeriod);
- final String logFolder = KylinConfig.getKylinHome() + "/logs/";
- final String defaultLogFilename = "kylin.log";
- final String defaultGCLogFilename = "kylin.gc";
- final File logsDir = new File(exportDir, "logs");
- final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ final File kylinLogDir = new File(KylinConfig.getKylinHome(), "logs");
+ final File exportLogsDir = new File(exportDir, "logs");
+ final ArrayList<File> logFiles = Lists.newArrayList();
+ final long logThresholdTime = System.currentTimeMillis() - logPeriod * 24 * 3600 * 1000;
- FileUtils.forceMkdir(logsDir);
-
- final ArrayList<String> logFileNames = Lists.newArrayListWithCapacity(logPeriod);
-
- logFileNames.add(defaultLogFilename);
- logFileNames.add(defaultGCLogFilename);
- for (int i = 1; i < logPeriod; i++) {
- Calendar todayCal = Calendar.getInstance();
- todayCal.add(Calendar.DAY_OF_MONTH, 0 - i);
- logFileNames.add(defaultLogFilename + "." + format.format(todayCal.getTime()));
- logFileNames.add(defaultGCLogFilename + "." + Integer.toString(i - 1));
+ FileUtils.forceMkdir(exportLogsDir);
+ for (File logFile : kylinLogDir.listFiles()) {
+ if (logFile.lastModified() > logThresholdTime) {
+ logFiles.add(logFile);
+ }
}
- for (String logFilename : logFileNames) {
- File logFile = new File(logFolder + logFilename);
+ for (File logFile : logFiles) {
logger.info("Log file:" + logFile.getAbsolutePath());
if (logFile.exists()) {
- FileUtils.copyFileToDirectory(logFile, logsDir);
+ FileUtils.copyFileToDirectory(logFile, exportLogsDir);
}
}
}