You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/09/02 04:49:46 UTC
[1/2] incubator-kylin git commit: hot fix: add host name in streaming
gap notification mail
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8 8ae2c0fd2 -> d501dc4e3
hot fix: add host name in streaming gap notification mail
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/730fab04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/730fab04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/730fab04
Branch: refs/heads/0.8
Commit: 730fab04ff0b1247944e0a4805496086e0f8ef47
Parents: 8ae2c0f
Author: honma <ho...@ebay.com>
Authored: Wed Sep 2 10:31:43 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Wed Sep 2 10:31:43 2015 +0800
----------------------------------------------------------------------
job/src/main/java/org/apache/kylin/job/monitor/MonitorCLI.java | 2 +-
.../main/java/org/apache/kylin/job/monitor/StreamingMonitor.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/730fab04/job/src/main/java/org/apache/kylin/job/monitor/MonitorCLI.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/monitor/MonitorCLI.java b/job/src/main/java/org/apache/kylin/job/monitor/MonitorCLI.java
index 2b3314b..7b9831a 100644
--- a/job/src/main/java/org/apache/kylin/job/monitor/MonitorCLI.java
+++ b/job/src/main/java/org/apache/kylin/job/monitor/MonitorCLI.java
@@ -62,7 +62,7 @@ public class MonitorCLI {
}
if (cubeName != null) {
logger.info(String.format("check cube cubeName:%s receivers:%s", cubeName, StringUtils.join(receivers, ";")));
- streamingMonitor.checkCube(receivers, cubeName);
+ streamingMonitor.checkCube(receivers, cubeName,host);
}
System.exit(0);
}
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/730fab04/job/src/main/java/org/apache/kylin/job/monitor/StreamingMonitor.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/monitor/StreamingMonitor.java b/job/src/main/java/org/apache/kylin/job/monitor/StreamingMonitor.java
index a56ec70..e23f065 100644
--- a/job/src/main/java/org/apache/kylin/job/monitor/StreamingMonitor.java
+++ b/job/src/main/java/org/apache/kylin/job/monitor/StreamingMonitor.java
@@ -113,7 +113,7 @@ public class StreamingMonitor {
return overlaps;
}
- public void checkCube(List<String> receivers, String cubeName) {
+ public void checkCube(List<String> receivers, String cubeName, String host) {
final CubeInstance cube = CubeManager.getInstance(KylinConfig.getInstanceFromEnv()).reloadCubeLocal(cubeName);
if (cube == null) {
logger.info("cube:" + cubeName + " does not exist");
@@ -136,7 +136,7 @@ public class StreamingMonitor {
}
if (content.length() > 0) {
logger.info(content.toString());
- sendMail(receivers, String.format("%s has gaps or overlaps", cubeName), content.toString());
+ sendMail(receivers, String.format("%s has gaps or overlaps on host %s", cubeName, host), content.toString());
} else {
logger.info("no gaps or overlaps");
}
[2/2] incubator-kylin git commit: KYLIN-982 package.sh should grep
out "Download*" messages when determining version
Posted by ma...@apache.org.
KYLIN-982 package.sh should grep out "Download*" messages when determining version
Signed-off-by: honma <ho...@ebay.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/d501dc4e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/d501dc4e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/d501dc4e
Branch: refs/heads/0.8
Commit: d501dc4e3e90083aad2a74a82e3762bbb45afb01
Parents: 730fab0
Author: gaodayue <ga...@meituan.com>
Authored: Tue Sep 1 23:36:10 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Wed Sep 2 10:51:11 2015 +0800
----------------------------------------------------------------------
script/package.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/d501dc4e/script/package.sh
----------------------------------------------------------------------
diff --git a/script/package.sh b/script/package.sh
index a4bda3f..b45de28 100755
--- a/script/package.sh
+++ b/script/package.sh
@@ -31,7 +31,7 @@ fi
dir=$(dirname ${0})
cd ${dir}/..
-version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['`
+version=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -E '^[0-9]+\.[0-9]+\.[0-9]+'`
echo "kylin version: ${version}"
export version