This is an automated email from the ASF dual-hosted git repository.
mikexue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/eventmesh.git
The following commit(s) were added to refs/heads/master by this push:
new c83feb533 [ISSUE #3863]Rename EventmeshRebalanceImpl class name and
EventmeshRebalanceImpl#caculateRedirectNum method name (#3864)
c83feb533 is described below
commit c83feb533ce795bcf69210141639d69250c792c1
Author: mxsm <[email protected]>
AuthorDate: Mon May 15 20:03:11 2023 +0800
[ISSUE #3863]Rename EventmeshRebalanceImpl class name and
EventmeshRebalanceImpl#caculateRedirectNum method name (#3864)
* [ISSUE #3863]Rename EventmeshRebalanceImpl class name and
EventmeshRebalanceImpl#caculateRedirectNum method name
* fix code style
---
.../eventmesh/runtime/boot/EventMeshTCPServer.java | 4 ++--
...hRebalanceImpl.java => EventMeshRebalanceImpl.java} | 18 ++++++++----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
index e1a834d78..67b56ed6d 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/boot/EventMeshTCPServer.java
@@ -35,8 +35,8 @@ import
org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcpConnect
import
org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcpExceptionHandler;
import
org.apache.eventmesh.runtime.core.protocol.tcp.client.EventMeshTcpMessageDispatcher;
import
org.apache.eventmesh.runtime.core.protocol.tcp.client.group.ClientSessionGroupMapping;
+import
org.apache.eventmesh.runtime.core.protocol.tcp.client.rebalance.EventMeshRebalanceImpl;
import
org.apache.eventmesh.runtime.core.protocol.tcp.client.rebalance.EventMeshRebalanceService;
-import
org.apache.eventmesh.runtime.core.protocol.tcp.client.rebalance.EventmeshRebalanceImpl;
import
org.apache.eventmesh.runtime.core.protocol.tcp.client.session.retry.EventMeshTcpRetryer;
import org.apache.eventmesh.runtime.metrics.tcp.EventMeshTcpMonitor;
import org.apache.eventmesh.runtime.registry.Registry;
@@ -234,7 +234,7 @@ public class EventMeshTCPServer extends
AbstractRemotingServer {
if (eventMeshTCPConfiguration.isEventMeshServerRegistryEnable()) {
eventMeshRebalanceService = new EventMeshRebalanceService(this,
- new EventmeshRebalanceImpl(this));
+ new EventMeshRebalanceImpl(this));
eventMeshRebalanceService.init();
}
diff --git
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventmeshRebalanceImpl.java
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventMeshRebalanceImpl.java
similarity index 95%
rename from
eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventmeshRebalanceImpl.java
rename to
eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventMeshRebalanceImpl.java
index 910034b95..139f88197 100644
---
a/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventmeshRebalanceImpl.java
+++
b/eventmesh-runtime/src/main/java/org/apache/eventmesh/runtime/core/protocol/tcp/client/rebalance/EventMeshRebalanceImpl.java
@@ -42,11 +42,11 @@ import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
@Slf4j
-public class EventmeshRebalanceImpl implements EventMeshRebalanceStrategy {
+public class EventMeshRebalanceImpl implements EventMeshRebalanceStrategy {
private final EventMeshTCPServer eventMeshTCPServer;
- public EventmeshRebalanceImpl(EventMeshTCPServer eventMeshTCPServer) {
+ public EventMeshRebalanceImpl(EventMeshTCPServer eventMeshTCPServer) {
this.eventMeshTCPServer = eventMeshTCPServer;
}
@@ -107,11 +107,10 @@ public class EventmeshRebalanceImpl implements
EventMeshRebalanceStrategy {
return localEventMeshMap;
}
- private void doRebalanceByGroup(String cluster, String group, String
purpose, Map<String,
- String> eventMeshMap) throws Exception {
+ private void doRebalanceByGroup(String cluster, String group, String
purpose, Map<String, String> eventMeshMap) throws Exception {
log.info("doRebalanceByGroup start, cluster:{}, group:{}, purpose:{}",
cluster, group, purpose);
- //query distribute data of loacl idc
+ //query distribute data of local idc
Map<String, Integer> clientDistributionMap =
queryLocalEventMeshDistributeData(cluster, group, purpose,
eventMeshMap);
if (MapUtils.isEmpty(clientDistributionMap)) {
@@ -130,12 +129,12 @@ public class EventmeshRebalanceImpl implements
EventMeshRebalanceStrategy {
return;
}
- //caculate client num need to redirect in currEventMesh
- int judge = caculateRedirectNum(currEventMeshName, group, purpose,
clientDistributionMap);
+ //calculate client num need to redirect in currEventMesh
+ int judge = calculateRedirectNum(currEventMeshName, group, purpose,
clientDistributionMap);
if (judge > 0) {
- //select redirect target eventmesh lisg
+ //select redirect target eventmesh list
List<String> eventMeshRecommendResult =
selectRedirectEventMesh(group, eventMeshMap, clientDistributionMap,
judge, currEventMeshName);
if (eventMeshRecommendResult == null ||
eventMeshRecommendResult.size() != judge) {
@@ -184,8 +183,7 @@ public class EventmeshRebalanceImpl implements
EventMeshRebalanceStrategy {
group, judge, eventMeshName);
}
- public int caculateRedirectNum(String eventMeshName, String group, String
purpose,
- Map<String, Integer> clientDistributionMap) throws Exception {
+ public int calculateRedirectNum(String eventMeshName, String group, String
purpose, Map<String, Integer> clientDistributionMap) throws Exception {
int sum = 0;
for (Integer item : clientDistributionMap.values()) {
sum += item;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
