Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

【fix】修复netty一直重连的bug #690

Merged
merged 1 commit into from
Aug 27, 2022
Merged

【fix】修复netty一直重连的bug #690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sermant-agentcore/sermant-agentcore-config/config/all/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
agent.config.isEnhanceBootStrapEnable=false
agent.config.ignoredPrefixes=com.huawei.sermant,com.huaweicloud.sermant
agent.config.combineStrategy=ALL
agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl
agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl,com.huaweicloud.sermant.core.service.send.NettyGatewayClient,com.huaweicloud.sermant.core.service.tracing.TracingServiceImpl

# adaptor config
adaptor.config.isLoadExtAgentEnable=false
Expand Down
2 changes: 1 addition & 1 deletion sermant-agentcore/sermant-agentcore-config/config/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
agent.config.isEnhanceBootStrapEnable=false
agent.config.ignoredPrefixes=com.huawei.sermant,com.huaweicloud.sermant
agent.config.combineStrategy=ALL
agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl
agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl,com.huaweicloud.sermant.core.service.send.NettyGatewayClient,com.huaweicloud.sermant.core.service.tracing.TracingServiceImpl

# adaptor config
adaptor.config.isLoadExtAgentEnable=false
Expand Down
2 changes: 1 addition & 1 deletion sermant-agentcore/sermant-agentcore-config/config/example/config.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
agent.config.isEnhanceBootStrapEnable=false
agent.config.ignoredPrefixes=com.huawei.sermant,com.huaweicloud.sermant
agent.config.combineStrategy=ALL
agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl
agent.config.serviceBlackList=com.huaweicloud.sermant.core.service.heartbeat.HeartbeatServiceImpl,com.huaweicloud.sermant.core.service.send.NettyGatewayClient,com.huaweicloud.sermant.core.service.tracing.TracingServiceImpl

# adaptor config
adaptor.config.isLoadExtAgentEnable=false
Expand Down
4 changes: 2 additions & 2 deletions ...wcontrol-common/src/main/java/com/huawei/flowcontrol/common/config/FlowControlConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,9 +177,9 @@ public class FlowControlConfig implements PluginConfig {
private boolean needThrowBizException = false;

/**
* 指标数据发送方式 默认Netty
* 指标数据发送方式 默认KAFKA
*/
private MetricSendWay sendWay = MetricSendWay.NETTY;
private MetricSendWay sendWay = MetricSendWay.KAFKA;

/**
* 等待指标数据写入文件的等待时间 单位MS
Expand Down
8 changes: 1 addition & 7 deletions ...l/flowcontrol-common/src/main/java/com/huawei/flowcontrol/common/enums/MetricSendWay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package com.huawei.flowcontrol.common.enums;

import com.huawei.flowcontrol.common.metric.MetricSender;
import com.huawei.flowcontrol.common.metric.NettyMetricSender;
import com.huawei.flowcontrol.common.metric.SimpleKafkaMetricSender;

/**
Expand All @@ -31,12 +30,7 @@ public enum MetricSendWay {
/**
* Kafka发送方式
*/
KAFKA(new SimpleKafkaMetricSender()),

/**
* Netty发送方式
*/
NETTY(new NettyMetricSender());
KAFKA(new SimpleKafkaMetricSender());

private final MetricSender sender;

Expand Down