You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by hz...@apache.org on 2022/12/04 08:38:31 UTC

[rocketmq] branch dledger-controller-snapshot updated: [ISSUE #5585] Implement SnapshotAbleMetadataManager for ReplicasInfoManager #5601 (#5641)

This is an automated email from the ASF dual-hosted git repository.

hzh0425 pushed a commit to branch dledger-controller-snapshot
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/dledger-controller-snapshot by this push:
     new 6699a8d01 [ISSUE #5585] Implement SnapshotAbleMetadataManager for ReplicasInfoManager #5601 (#5641)
6699a8d01 is described below

commit 6699a8d01920c2d2d29a42c3119dd87918452cfe
Author: hzh0425 <64...@qq.com>
AuthorDate: Sun Dec 4 16:38:23 2022 +0800

    [ISSUE #5585] Implement SnapshotAbleMetadataManager for ReplicasInfoManager #5601 (#5641)
    
    * Implement SnapshotAbleMetadataManager for ReplicasInfoManager
---
 .../controller/impl/manager/BrokerInfo.java        | 74 +++++++++++++++-----
 .../impl/manager/ReplicasInfoManager.java          | 78 +++++++++++++++++-----
 .../controller/impl/manager/SyncStateInfo.java     | 63 +++++++++++++++--
 .../impl/manager/ReplicasInfoManagerTest.java      | 19 +++++-
 4 files changed, 192 insertions(+), 42 deletions(-)

diff --git a/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/BrokerInfo.java b/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/BrokerInfo.java
index 0d56285fb..03e792173 100644
--- a/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/BrokerInfo.java
+++ b/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/BrokerInfo.java
@@ -16,17 +16,19 @@
  */
 package org.apache.rocketmq.controller.impl.manager;
 
+import com.alibaba.fastjson.JSONObject;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
 
 public class BrokerInfo {
-    private final String clusterName;
-    private final String brokerName;
+    private String clusterName;
+    private String brokerName;
     // Start from 1
-    private final AtomicLong brokerIdCount;
-    private final HashMap<String/*Address*/, Long/*brokerId*/> brokerIdTable;
+    private AtomicLong brokerIdCount;
+    private HashMap<String/*Address*/, Long/*brokerId*/> brokerIdTable;
 
     public BrokerInfo(String clusterName, String brokerName) {
         this.clusterName = clusterName;
@@ -35,42 +37,84 @@ public class BrokerInfo {
         this.brokerIdTable = new HashMap<>();
     }
 
+    // This constructor is to adapt FastJSONSerializer
+    public BrokerInfo(String clusterName, String brokerName, Integer brokerIdCount, JSONObject brokerIdTable) {
+        this.clusterName = clusterName;
+        this.brokerName = brokerName;
+        this.brokerIdCount = new AtomicLong(brokerIdCount);
+        this.brokerIdTable = new HashMap<>();
+        brokerIdTable.entrySet().forEach(entry -> {
+            Long brokerId = new Long((Integer) entry.getValue());
+            this.brokerIdTable.put(entry.getKey(), brokerId);
+        });
+    }
+
     public void removeBrokerAddress(final String address) {
         this.brokerIdTable.remove(address);
     }
 
+    public void addBroker(final String address, final Long brokerId) {
+        this.brokerIdTable.put(address, brokerId);
+    }
+
+    public boolean isBrokerExist(final String address) {
+        return this.brokerIdTable.containsKey(address);
+    }
+
+    public Set<String> allBrokers() {
+        return new HashSet<>(this.brokerIdTable.keySet());
+    }
+
     public long newBrokerId() {
         return this.brokerIdCount.incrementAndGet();
     }
 
+    public Long getBrokerIdByAddress(final String address) {
+        if (this.brokerIdTable.containsKey(address)) {
+            return this.brokerIdTable.get(address);
+        }
+        return -1L;
+    }
+
     public String getClusterName() {
         return clusterName;
     }
 
+    public void setClusterName(String clusterName) {
+        this.clusterName = clusterName;
+    }
+
     public String getBrokerName() {
         return brokerName;
     }
 
-    public void addBroker(final String address, final Long brokerId) {
-        this.brokerIdTable.put(address, brokerId);
+    public void setBrokerName(String brokerName) {
+        this.brokerName = brokerName;
     }
 
-    public boolean isBrokerExist(final String address) {
-        return this.brokerIdTable.containsKey(address);
+    public AtomicLong getBrokerIdCount() {
+        return brokerIdCount;
     }
 
-    public Set<String> getAllBroker() {
-        return new HashSet<>(this.brokerIdTable.keySet());
+    public void setBrokerIdCount(Long brokerIdCount) {
+        this.brokerIdCount = new AtomicLong(brokerIdCount);
     }
 
     public HashMap<String, Long> getBrokerIdTable() {
         return new HashMap<>(this.brokerIdTable);
     }
 
-    public Long getBrokerId(final String address) {
-        if (this.brokerIdTable.containsKey(address)) {
-            return this.brokerIdTable.get(address);
-        }
-        return -1L;
+    public void setBrokerIdTable(HashMap<String, Long> brokerIdTable) {
+        this.brokerIdTable = brokerIdTable;
+    }
+
+    @Override
+    public String toString() {
+        return "BrokerInfo{" +
+                "clusterName='" + clusterName + '\'' +
+                ", brokerName='" + brokerName + '\'' +
+                ", brokerIdCount=" + brokerIdCount +
+                ", brokerIdTable=" + brokerIdTable +
+                '}';
     }
 }
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 02ea9a6b6..9636f63a0 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
@@ -16,15 +16,6 @@
  */
 package org.apache.rocketmq.controller.impl.manager;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.BiPredicate;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.common.ControllerConfig;
 import org.apache.rocketmq.common.MixAll;
@@ -39,6 +30,7 @@ import org.apache.rocketmq.controller.impl.event.EventMessage;
 import org.apache.rocketmq.controller.impl.event.EventType;
 import org.apache.rocketmq.logging.org.slf4j.Logger;
 import org.apache.rocketmq.logging.org.slf4j.LoggerFactory;
+import org.apache.rocketmq.remoting.protocol.RemotingSerializable;
 import org.apache.rocketmq.remoting.protocol.ResponseCode;
 import org.apache.rocketmq.remoting.protocol.body.BrokerMemberGroup;
 import org.apache.rocketmq.remoting.protocol.body.InSyncStateData;
@@ -53,16 +45,30 @@ import org.apache.rocketmq.remoting.protocol.header.controller.GetReplicaInfoRes
 import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerRequestHeader;
 import org.apache.rocketmq.remoting.protocol.header.controller.RegisterBrokerToControllerResponseHeader;
 
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiPredicate;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 /**
  * The manager that manages the replicas info for all brokers. We can think of this class as the controller's memory
  * state machine It should be noted that this class is not thread safe, and the upper layer needs to ensure that it can
  * be called sequentially
  */
-public class ReplicasInfoManager {
+public class ReplicasInfoManager implements SnapshotAbleMetadataManager {
     private static final Logger log = LoggerFactory.getLogger(LoggerName.CONTROLLER_LOGGER_NAME);
-    private final ControllerConfig controllerConfig;
-    private final Map<String/* brokerName */, BrokerInfo> replicaInfoTable;
-    private final Map<String/* brokerName */, SyncStateInfo> syncStateSetInfoTable;
+    private ControllerConfig controllerConfig;
+    private Map<String/* brokerName */, BrokerInfo> replicaInfoTable;
+    private Map<String/* brokerName */, SyncStateInfo> syncStateSetInfoTable;
+
+    public ReplicasInfoManager() {
+    }
 
     public ReplicasInfoManager(final ControllerConfig config) {
         this.controllerConfig = config;
@@ -163,7 +169,7 @@ public class ReplicasInfoManager {
             final BrokerInfo brokerInfo = this.replicaInfoTable.get(brokerName);
             final Set<String> syncStateSet = syncStateInfo.getSyncStateSet();
             final String oldMaster = syncStateInfo.getMasterAddress();
-            Set<String> allReplicaBrokers = controllerConfig.isEnableElectUncleanMaster() ? brokerInfo.getAllBroker() : null;
+            Set<String> allReplicaBrokers = controllerConfig.isEnableElectUncleanMaster() ? brokerInfo.allBrokers() : null;
 
             // elect by policy
             String newMaster = electPolicy.elect(brokerInfo.getClusterName(), syncStateSet, allReplicaBrokers, oldMaster, assignBrokerAddress);
@@ -234,7 +240,7 @@ public class ReplicasInfoManager {
                 final ApplyBrokerIdEvent applyIdEvent = new ApplyBrokerIdEvent(request.getBrokerName(), brokerAddress, brokerId);
                 result.addEvent(applyIdEvent);
             } else {
-                brokerId = brokerInfo.getBrokerId(brokerAddress);
+                brokerId = brokerInfo.getBrokerIdByAddress(brokerAddress);
             }
             response.setBrokerId(brokerId);
             response.setMasterEpoch(syncStateInfo.getMasterEpoch());
@@ -287,7 +293,7 @@ public class ReplicasInfoManager {
             response.setMasterAddress(masterAddress);
             response.setMasterEpoch(syncStateInfo.getMasterEpoch());
             if (StringUtils.isNotEmpty(request.getBrokerAddress())) {
-                response.setBrokerId(brokerInfo.getBrokerId(request.getBrokerAddress()));
+                response.setBrokerId(brokerInfo.getBrokerIdByAddress(request.getBrokerAddress()));
             }
             result.setBody(new SyncStateSet(syncStateInfo.getSyncStateSet(), syncStateInfo.getSyncStateSetEpoch()).encode());
             return result;
@@ -308,7 +314,7 @@ public class ReplicasInfoManager {
                 final String master = syncStateInfo.getMasterAddress();
                 final ArrayList<InSyncStateData.InSyncMember> inSyncMembers = new ArrayList<>();
                 syncStateSet.forEach(replicas -> {
-                    long brokerId = StringUtils.equals(master, replicas) ? MixAll.MASTER_ID : brokerInfo.getBrokerId(replicas);
+                    long brokerId = StringUtils.equals(master, replicas) ? MixAll.MASTER_ID : brokerInfo.getBrokerIdByAddress(replicas);
                     inSyncMembers.add(new InSyncStateData.InSyncMember(replicas, brokerId));
                 });
 
@@ -466,4 +472,42 @@ public class ReplicasInfoManager {
     private boolean isContainsBroker(final String brokerName) {
         return this.replicaInfoTable.containsKey(brokerName) && this.syncStateSetInfoTable.containsKey(brokerName);
     }
+
+
+    @Override
+    public byte[] encodeMetadata() {
+        String json = RemotingSerializable.toJson(this, true);
+        System.out.println(json);
+        return json.getBytes(StandardCharsets.UTF_8);
+    }
+
+    @Override
+    public boolean loadMetadata(byte[] data) {
+        String json = new String(data);
+        ReplicasInfoManager obj = RemotingSerializable.fromJson(json, ReplicasInfoManager.class);
+        this.syncStateSetInfoTable.putAll(obj.syncStateSetInfoTable);
+        this.replicaInfoTable.putAll(obj.replicaInfoTable);
+        return true;
+    }
+
+    @Override
+    public MetadataManagerType getMetadataManagerType() {
+        return MetadataManagerType.REPLICAS_INFO_MANAGER;
+    }
+
+    public Map<String, BrokerInfo> getReplicaInfoTable() {
+        return replicaInfoTable;
+    }
+
+    public void setReplicaInfoTable(Map<String, BrokerInfo> replicaInfoTable) {
+        this.replicaInfoTable = replicaInfoTable;
+    }
+
+    public Map<String, SyncStateInfo> getSyncStateSetInfoTable() {
+        return syncStateSetInfoTable;
+    }
+
+    public void setSyncStateSetInfoTable(Map<String, SyncStateInfo> syncStateSetInfoTable) {
+        this.syncStateSetInfoTable = syncStateSetInfoTable;
+    }
 }
diff --git a/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/SyncStateInfo.java b/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/SyncStateInfo.java
index 997dee3c5..a1415ad7e 100644
--- a/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/SyncStateInfo.java
+++ b/controller/src/main/java/org/apache/rocketmq/controller/impl/manager/SyncStateInfo.java
@@ -16,6 +16,8 @@
  */
 package org.apache.rocketmq.controller.impl.manager;
 
+import com.alibaba.fastjson.JSONArray;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -23,15 +25,15 @@ import java.util.Set;
  * Manages the syncStateSet of broker replicas.
  */
 public class SyncStateInfo {
-    private final String clusterName;
-    private final String brokerName;
-
-    private Set<String/*Address*/> syncStateSet;
-    private int syncStateSetEpoch;
+    private String clusterName;
+    private String brokerName;
 
     private String masterAddress;
     private int masterEpoch;
 
+    private int syncStateSetEpoch;
+    private Set<String/*Address*/> syncStateSet;
+
     public SyncStateInfo(String clusterName, String brokerName, String masterAddress) {
         this.clusterName = clusterName;
         this.brokerName = brokerName;
@@ -42,6 +44,17 @@ public class SyncStateInfo {
         this.syncStateSetEpoch = 1;
     }
 
+    // This constructor is to adapt FastJSONSerializer.
+    public SyncStateInfo(String clusterName, String brokerName, String masterAddress, int masterEpoch, int syncStateSetEpoch, JSONArray syncStateSet) {
+        this.clusterName = clusterName;
+        this.brokerName = brokerName;
+        this.masterAddress = masterAddress;
+        this.masterEpoch = masterEpoch;
+        this.syncStateSetEpoch = syncStateSetEpoch;
+        this.syncStateSet = new HashSet<>();
+        syncStateSet.forEach(entry -> this.syncStateSet.add((String) entry));
+    }
+
     public void updateMasterInfo(String masterAddress) {
         this.masterAddress = masterAddress;
         this.masterEpoch++;
@@ -56,31 +69,67 @@ public class SyncStateInfo {
         return !this.masterAddress.isEmpty();
     }
 
+    public void removeSyncState(final String address) {
+        syncStateSet.remove(address);
+    }
+
     public String getClusterName() {
         return clusterName;
     }
 
+    public void setClusterName(String clusterName) {
+        this.clusterName = clusterName;
+    }
+
     public String getBrokerName() {
         return brokerName;
     }
 
+    public void setBrokerName(String brokerName) {
+        this.brokerName = brokerName;
+    }
+
     public Set<String> getSyncStateSet() {
         return new HashSet<>(syncStateSet);
     }
 
+    public void setSyncStateSet(Set<String> syncStateSet) {
+        this.syncStateSet = syncStateSet;
+    }
+
     public int getSyncStateSetEpoch() {
         return syncStateSetEpoch;
     }
 
+    public void setSyncStateSetEpoch(int syncStateSetEpoch) {
+        this.syncStateSetEpoch = syncStateSetEpoch;
+    }
+
     public String getMasterAddress() {
         return masterAddress;
     }
 
+    public void setMasterAddress(String masterAddress) {
+        this.masterAddress = masterAddress;
+    }
+
     public int getMasterEpoch() {
         return masterEpoch;
     }
 
-    public void removeSyncState(final String address) {
-        syncStateSet.remove(address);
+    public void setMasterEpoch(int masterEpoch) {
+        this.masterEpoch = masterEpoch;
+    }
+
+    @Override
+    public String toString() {
+        return "SyncStateInfo{" +
+                "clusterName='" + clusterName + '\'' +
+                ", brokerName='" + brokerName + '\'' +
+                ", masterAddress='" + masterAddress + '\'' +
+                ", masterEpoch=" + masterEpoch +
+                ", syncStateSetEpoch=" + syncStateSetEpoch +
+                ", syncStateSet=" + syncStateSet +
+                '}';
     }
 }
diff --git a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java
index 270f98089..9822abc0a 100644
--- a/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java
+++ b/controller/src/test/java/org/apache/rocketmq/controller/impl/controller/impl/manager/ReplicasInfoManagerTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.rocketmq.controller.impl.controller.impl.manager;
 
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
 import org.apache.rocketmq.common.ControllerConfig;
 import org.apache.rocketmq.controller.elect.ElectPolicy;
 import org.apache.rocketmq.controller.elect.impl.DefaultElectPolicy;
@@ -43,6 +40,10 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -308,4 +309,16 @@ public class ReplicasInfoManagerTest {
         assertEquals(ResponseCode.SUCCESS, result7.getResponseCode());
 
     }
+
+
+    @Test
+    public void testSnapshot() {
+        mockMetaData();
+        byte[] metadata = this.replicasInfoManager.encodeMetadata();
+
+        ReplicasInfoManager replicasInfoManager1 = new ReplicasInfoManager(null);
+        assertTrue(replicasInfoManager1.loadMetadata(metadata));
+
+        assertArrayEquals(metadata, replicasInfoManager1.encodeMetadata());
+    }
 }