You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2018/12/01 01:41:13 UTC
[incubator-skywalking] branch endpoint-and-instance-alarm updated:
Fix alarm bug.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch endpoint-and-instance-alarm
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git
The following commit(s) were added to refs/heads/endpoint-and-instance-alarm by this push:
new 7d0d1d5 Fix alarm bug.
7d0d1d5 is described below
commit 7d0d1d5bc1e7c9ced89a4be41ba535c6ced82a71
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat Dec 1 09:41:00 2018 +0800
Fix alarm bug.
---
.../skywalking/oap/server/core/alarm/provider/AlarmCore.java | 12 ++++++++----
.../oap/server/core/alarm/provider/RunningRule.java | 11 +++--------
.../skywalking/oap/server/core/alarm/AlarmEntrance.java | 2 +-
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java
index e76591d..b43e18c 100644
--- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java
+++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/AlarmCore.java
@@ -69,21 +69,25 @@ public class AlarmCore {
Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(() -> {
try {
List<AlarmMessage> alarmMessageList = new ArrayList<>(30);
+ LocalDateTime checkTime = LocalDateTime.now();
+ int minutes = Minutes.minutesBetween(lastExecuteTime, checkTime).getMinutes();
+ boolean[] hasExecute = new boolean[] {false};
runningContext.values().forEach(ruleList -> ruleList.forEach(runningRule -> {
- LocalDateTime checkTime = LocalDateTime.now();
- int minutes = Minutes.minutesBetween(lastExecuteTime, checkTime).getMinutes();
if (minutes > 0) {
+ hasExecute[0] = true;
runningRule.moveTo(checkTime);
/**
* Don't run in the first quarter per min, avoid to trigger false alarm.
*/
if (checkTime.getSecondOfMinute() > 15) {
alarmMessageList.addAll(runningRule.check());
- // Set the last execute time, and make sure the second is `00`, such as: 18:30:00
- lastExecuteTime = checkTime.minusSeconds(checkTime.getSecondOfMinute());
}
}
}));
+ // Set the last execute time, and make sure the second is `00`, such as: 18:30:00
+ if (hasExecute[0]) {
+ lastExecuteTime = checkTime.minusSeconds(checkTime.getSecondOfMinute());
+ }
if (alarmMessageList.size() > 0) {
allCallbacks.forEach(callback -> callback.doAlarm(alarmMessageList));
diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java
index a010392..dd0659d 100644
--- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java
+++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/RunningRule.java
@@ -118,14 +118,9 @@ public class RunningRule {
Window window = windows.get(meta);
if (window == null) {
window = new Window(period);
- Window ifAbsent = windows.putIfAbsent(meta, window);
- if (ifAbsent == null) {
- LocalDateTime timebucket = TIME_BUCKET_FORMATTER.parseLocalDateTime(indicator.getTimeBucket() + "");
- window.moveTo(timebucket);
- } else {
- window = windows.get(meta);
- }
-
+ LocalDateTime timebucket = TIME_BUCKET_FORMATTER.parseLocalDateTime(indicator.getTimeBucket() + "");
+ window.moveTo(timebucket);
+ windows.put(meta, window);
}
window.add(indicator);
diff --git a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmEntrance.java b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmEntrance.java
index 5490a17..b2d0e41 100644
--- a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmEntrance.java
+++ b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/alarm/AlarmEntrance.java
@@ -54,7 +54,7 @@ public class AlarmEntrance {
AlarmMeta alarmMeta = ((AlarmSupported)indicator).getAlarmMeta();
- MetaInAlarm metaInAlarm = null;
+ MetaInAlarm metaInAlarm;
switch (alarmMeta.getScope()) {
case Service:
int serviceId = Integer.parseInt(alarmMeta.getId());