You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2023/04/22 13:24:27 UTC
[skywalking] branch master updated: Polish log of alert GRPCCallback (#10712)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new af2cf9958f Polish log of alert GRPCCallback (#10712)
af2cf9958f is described below
commit af2cf9958f205bb147e1585e3ccc46f2cfbd90ab
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sat Apr 22 21:24:20 2023 +0800
Polish log of alert GRPCCallback (#10712)
---
.../skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java | 3 ++-
test/e2e-v2/cases/virtual-mq/docker-compose.yml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java
index de85df8ad4..1eb3246441 100644
--- a/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java
+++ b/oap-server/server-alarm-plugin/src/main/java/org/apache/skywalking/oap/server/core/alarm/provider/grpc/GRPCCallback.java
@@ -143,11 +143,11 @@ public class GRPCCallback implements AlarmCallback {
if (grpcAlarmSetting == null) {
if (grpcClient != null) {
grpcClient.shutdown();
+ log.debug("gRPC alarm hook target is empty, shutdown the old gRPC client.");
}
alarmServiceStub = null;
alarmSetting = null;
- log.warn("gRPC alarm hook settings about host is empty, shutdown the old gRPC client.");
return;
}
@@ -155,6 +155,7 @@ public class GRPCCallback implements AlarmCallback {
alarmSetting = grpcAlarmSetting;
if (grpcClient != null) {
grpcClient.shutdown();
+ log.debug("gRPC alarm hook target is changed, shutdown the old gRPC client.");
}
grpcClient = new GRPCClient(grpcAlarmSetting.getTargetHost(), grpcAlarmSetting.getTargetPort());
grpcClient.connect();
diff --git a/test/e2e-v2/cases/virtual-mq/docker-compose.yml b/test/e2e-v2/cases/virtual-mq/docker-compose.yml
index b13269431c..576d14a559 100644
--- a/test/e2e-v2/cases/virtual-mq/docker-compose.yml
+++ b/test/e2e-v2/cases/virtual-mq/docker-compose.yml
@@ -66,7 +66,7 @@ services:
networks:
e2e:
kafka:
- image: 'bitnami/kafka:latest'
+ image: 'bitnami/kafka:2.4.1'
environment:
- KAFKA_BROKER_ID=1
- KAFKA_CFG_LISTENERS=PLAINTEXT://:9092