This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new cc484d5680 [ISSUE #8454] Active brokers number should be initailized
to 1 in broker heartbeat manager. (#8453)
cc484d5680 is described below
commit cc484d56805b8387f0660809ae7e3117a8fd1c46
Author: dinglei <[email protected]>
AuthorDate: Sun Jul 28 17:12:59 2024 +0800
[ISSUE #8454] Active brokers number should be initailized to 1 in broker
heartbeat manager. (#8453)
* active brokers should be 1 on computing if absent
* active brokers number should be initailized to 1 in broker heartbeat
manager.
---
.../controller/impl/heartbeat/DefaultBrokerHeartbeatManager.java | 2 +-
.../rocketmq/controller/impl/heartbeat/RaftBrokerHeartBeatManager.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/controller/src/main/java/org/apache/rocketmq/controller/impl/heartbeat/DefaultBrokerHeartbeatManager.java
b/controller/src/main/java/org/apache/rocketmq/controller/impl/heartbeat/DefaultBrokerHeartbeatManager.java
index 5ec298a383..05d742fb7b 100644
---
a/controller/src/main/java/org/apache/rocketmq/controller/impl/heartbeat/DefaultBrokerHeartbeatManager.java
+++
b/controller/src/main/java/org/apache/rocketmq/controller/impl/heartbeat/DefaultBrokerHeartbeatManager.java
@@ -184,7 +184,7 @@ public class DefaultBrokerHeartbeatManager implements
BrokerHeartbeatManager {
.forEach(id -> {
map.computeIfAbsent(id.getClusterName(), k -> new HashMap<>());
map.get(id.getClusterName()).compute(id.getBrokerName(),
(broker, num) ->
- num == null ? 0 : num + 1
+ num == null ? 1 : num + 1
);
});
return map;
diff --git
a/controller/src/main/java/org/apache/rocketmq/controller/impl/heartbeat/RaftBrokerHeartBeatManager.java
b/controller/src/main/java/org/apache/rocketmq/controller/impl/heartbeat/RaftBrokerHeartBeatManager.java
index 99f7b34d4a..d981ff430c 100644
---
a/controller/src/main/java/org/apache/rocketmq/controller/impl/heartbeat/RaftBrokerHeartBeatManager.java
+++
b/controller/src/main/java/org/apache/rocketmq/controller/impl/heartbeat/RaftBrokerHeartBeatManager.java
@@ -263,7 +263,7 @@ public class RaftBrokerHeartBeatManager implements
BrokerHeartbeatManager {
.forEach(id -> {
map.computeIfAbsent(id.getClusterName(), k -> new HashMap<>());
map.get(id.getClusterName()).compute(id.getBrokerName(),
(broker, num) ->
- num == null ? 0 : num + 1
+ num == null ? 1 : num + 1
);
});
return map;