opensource/rocketmq
3
0
Fork 0
mirror of https://github.com/apache/rocketmq.git synced 2026-08-30 18:10:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve the conflict

Browse Source
This commit is contained in:
RongtongJin
2023-02-01 16:27:40 +08:00
committed by rongtong
parent a1de567e11
commit 2c2db61e32
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/src/main/java/org/apache/rocketmq/controller/impl/manager/ReplicasInfoManager.java
+2 -2
View File
@@ -321,9 +321,9 @@ public class ReplicasInfoManager {
final ArrayList<BrokerReplicasInfo.ReplicaIdentity> inSyncReplicas = new ArrayList<>();
final ArrayList<BrokerReplicasInfo.ReplicaIdentity> notInSyncReplicas = new ArrayList<>();
brokerInfo.getBrokerIdTable().forEach((brokerAddress, brokerId) -> {
brokerReplicaInfo.getBrokerIdTable().forEach((brokerAddress, brokerId) -> {
if (syncStateSet.contains(brokerAddress)) {
long id = StringUtils.equals(master, brokerAddress) ? MixAll.MASTER_ID : brokerInfo.getBrokerId(brokerAddress);
long id = StringUtils.equals(master, brokerAddress) ? MixAll.MASTER_ID : brokerReplicaInfo.getBrokerId(brokerAddress);
inSyncReplicas.add(new BrokerReplicasInfo.ReplicaIdentity(brokerAddress, id));
} else {
notInSyncReplicas.add(new BrokerReplicasInfo.ReplicaIdentity(brokerAddress, brokerId));
controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java
+3 -3
View File
@@ -32,7 +32,7 @@ import org.apache.rocketmq.controller.impl.event.EventMessage;
import org.apache.rocketmq.controller.impl.manager.ReplicasInfoManager;
import org.apache.rocketmq.remoting.protocol.RemotingSerializable;
import org.apache.rocketmq.remoting.protocol.ResponseCode;
import org.apache.rocketmq.remoting.protocol.body.InSyncStateData;
import org.apache.rocketmq.remoting.protocol.body.BrokerReplicasInfo;
import org.apache.rocketmq.remoting.protocol.body.SyncStateSet;
import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetRequestHeader;
import org.apache.rocketmq.remoting.protocol.header.controller.AlterSyncStateSetResponseHeader;
@@ -101,7 +101,7 @@ public class ReplicasInfoManagerTest {
final GetReplicaInfoResponseHeader replicaInfoBefore = this.replicasInfoManager.getReplicaInfo(new GetReplicaInfoRequestHeader(brokerName, brokerAddress)).getResponse();
byte[] body = this.replicasInfoManager.getSyncStateData(Arrays.asList(brokerName)).getBody();
InSyncStateData syncStateDataBefore = RemotingSerializable.decode(body, InSyncStateData.class);
BrokerReplicasInfo syncStateDataBefore = RemotingSerializable.decode(body, BrokerReplicasInfo.class);
// Try elect itself as a master
ElectMasterRequestHeader requestHeader = ElectMasterRequestHeader.ofBrokerTrigger(clusterName, brokerName, brokerAddress);
final ControllerResult<ElectMasterResponseHeader> result = this.replicasInfoManager.electMaster(requestHeader, this.electPolicy);
@@ -131,7 +131,7 @@ public class ReplicasInfoManagerTest {
assertEquals(brokerId, replicaInfoAfter.getBrokerId());
return;
}
if (syncStateDataBefore.getInSyncStateTable().containsKey(brokerAddress) || this.config.isEnableElectUncleanMaster()) {
if (syncStateDataBefore.getReplicasInfoTable().containsKey(brokerAddress) || this.config.isEnableElectUncleanMaster()) {
// can be elected successfully
assertEquals(ResponseCode.SUCCESS, result.getResponseCode());
assertEquals(MixAll.MASTER_ID, replicaInfoAfter.getBrokerId());