You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2022/12/12 01:27:10 UTC
[rocketmq] branch develop updated: [ISSUE #5686] Polish ReplicasInfoManager comment and static log attribute (#5687)
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 c4e581cf9 [ISSUE #5686] Polish ReplicasInfoManager comment and static log attribute (#5687)
c4e581cf9 is described below
commit c4e581cf9e1815b7208b1348bc89ecf1f9105d53
Author: mxsm <lj...@gmail.com>
AuthorDate: Mon Dec 12 09:27:04 2022 +0800
[ISSUE #5686] Polish ReplicasInfoManager comment and static log attribute (#5687)
---
.../impl/manager/ReplicasInfoManager.java | 26 +++++++++++-----------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java b/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java
index 4e9ad6cb1..a820b069e 100644
--- a/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java
+++ b/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java
@@ -59,7 +59,7 @@ import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToC
* be called sequentially
*/
public class ReplicasInfoManager {
- private static final Logger log = LoggerFactory.getLogger(LoggerName.CONTROLLER_LOGGER_NAME);
+ private static final Logger LOGGER = LoggerFactory.getLogger(LoggerName.CONTROLLER_LOGGER_NAME);
private final ControllerConfig controllerConfig;
private final Map<String/* brokerName */, BrokerInfo> replicaInfoTable;
private final Map<String/* brokerName */, SyncStateInfo> syncStateSetInfoTable;
@@ -86,7 +86,7 @@ public class ReplicasInfoManager {
final Set<String> oldSyncStateSet = syncStateInfo.getSyncStateSet();
if (oldSyncStateSet.size() == newSyncStateSet.size() && oldSyncStateSet.containsAll(newSyncStateSet)) {
String err = "The newSyncStateSet is equal with oldSyncStateSet, no needed to update syncStateSet";
- log.warn("{}", err);
+ LOGGER.warn("{}", err);
result.setCodeAndRemark(ResponseCode.CONTROLLER_ALTER_SYNC_STATE_SET_FAILED, err);
return result;
}
@@ -95,7 +95,7 @@ public class ReplicasInfoManager {
if (!syncStateInfo.getMasterAddress().equals(request.getMasterAddress())) {
String err = String.format("Rejecting alter syncStateSet request because the current leader is:{%s}, not {%s}",
syncStateInfo.getMasterAddress(), request.getMasterAddress());
- log.error("{}", err);
+ LOGGER.error("{}", err);
result.setCodeAndRemark(ResponseCode.CONTROLLER_INVALID_MASTER, err);
return result;
}
@@ -104,7 +104,7 @@ public class ReplicasInfoManager {
if (request.getMasterEpoch() != syncStateInfo.getMasterEpoch()) {
String err = String.format("Rejecting alter syncStateSet request because the current master epoch is:{%d}, not {%d}",
syncStateInfo.getMasterEpoch(), request.getMasterEpoch());
- log.error("{}", err);
+ LOGGER.error("{}", err);
result.setCodeAndRemark(ResponseCode.CONTROLLER_FENCED_MASTER_EPOCH, err);
return result;
}
@@ -113,7 +113,7 @@ public class ReplicasInfoManager {
if (syncStateSet.getSyncStateSetEpoch() != syncStateInfo.getSyncStateSetEpoch()) {
String err = String.format("Rejecting alter syncStateSet request because the current syncStateSet epoch is:{%d}, not {%d}",
syncStateInfo.getSyncStateSetEpoch(), syncStateSet.getSyncStateSetEpoch());
- log.error("{}", err);
+ LOGGER.error("{}", err);
result.setCodeAndRemark(ResponseCode.CONTROLLER_FENCED_SYNC_STATE_SET_EPOCH, err);
return result;
}
@@ -122,13 +122,13 @@ public class ReplicasInfoManager {
for (String replicas : newSyncStateSet) {
if (!brokerInfo.isBrokerExist(replicas)) {
String err = String.format("Rejecting alter syncStateSet request because the replicas {%s} don't exist", replicas);
- log.error("{}", err);
+ LOGGER.error("{}", err);
result.setCodeAndRemark(ResponseCode.CONTROLLER_INVALID_REPLICAS, err);
return result;
}
if (!brokerAlivePredicate.test(brokerInfo.getClusterName(), replicas)) {
String err = String.format("Rejecting alter syncStateSet request because the replicas {%s} don't alive", replicas);
- log.error(err);
+ LOGGER.error(err);
result.setCodeAndRemark(ResponseCode.CONTROLLER_BROKER_NOT_ALIVE, err);
return result;
}
@@ -136,7 +136,7 @@ public class ReplicasInfoManager {
if (!newSyncStateSet.contains(syncStateInfo.getMasterAddress())) {
String err = String.format("Rejecting alter syncStateSet request because the newSyncStateSet don't contains origin leader {%s}", syncStateInfo.getMasterAddress());
- log.error(err);
+ LOGGER.error(err);
result.setCodeAndRemark(ResponseCode.CONTROLLER_ALTER_SYNC_STATE_SET_FAILED, err);
return result;
}
@@ -170,7 +170,7 @@ public class ReplicasInfoManager {
if (StringUtils.isNotEmpty(newMaster) && newMaster.equals(oldMaster)) {
// old master still valid, change nothing
String err = String.format("The old master %s is still alive, not need to elect new master for broker %s", oldMaster, brokerInfo.getBrokerName());
- log.warn("{}", err);
+ LOGGER.warn("{}", err);
result.setCodeAndRemark(ResponseCode.CONTROLLER_ELECT_MASTER_FAILED, err);
return result;
}
@@ -259,8 +259,8 @@ public class ReplicasInfoManager {
canBeElectedAsMaster = true;
} else {
// If the master is not alive and all slave is not alive, we should elect a new master:
- // Case2: This replicas was in sync state set list
- // Case3: The option {EnableElectUncleanMaster} is true
+ // Case1: This replicas was in sync state set list
+ // Case2: The option {EnableElectUncleanMaster} is true
canBeElectedAsMaster = syncStateInfo.getSyncStateSet().contains(brokerAddress) || this.controllerConfig.isEnableElectUncleanMaster();
}
if (!canBeElectedAsMaster) {
@@ -271,8 +271,8 @@ public class ReplicasInfoManager {
}
} else {
// If the master is not alive, we should elect a new master:
- // Case2: This replicas was in sync state set list
- // Case3: The option {EnableElectUncleanMaster} is true
+ // Case1: This replicas was in sync state set list
+ // Case2: The option {EnableElectUncleanMaster} is true
canBeElectedAsMaster = syncStateInfo.getSyncStateSet().contains(brokerAddress) || this.controllerConfig.isEnableElectUncleanMaster();
}
} else {