add ms

deardeng · Jul 22, 2024 · 52b17e8 · 52b17e8
1 parent e4ed733
commit 52b17e8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/cloud/src/resource-manager/resource_manager.cpp b/cloud/src/resource-manager/resource_manager.cpp
@@ -157,15 +157,18 @@ bool ResourceManager::check_cluster_params_valid(const ClusterPB& cluster, std::
     std::stringstream ss;
     bool no_err = true;
     int master_num = 0;
+    int follower_num = 0;
     for (auto& n : cluster.nodes()) {
         if (ClusterPB::SQL == cluster.type() && n.has_edit_log_port() && n.edit_log_port() &&
             n.has_node_type() &&
             (n.node_type() == NodeInfoPB_NodeType_FE_MASTER ||
-             n.node_type() == NodeInfoPB_NodeType_FE_OBSERVER)) {
+             n.node_type() == NodeInfoPB_NodeType_FE_OBSERVER ||
+             n.node_type() == NodeInfoPB_NodeType_FE_FOLLOWER)) {
             master_num += n.node_type() == NodeInfoPB_NodeType_FE_MASTER ? 1 : 0;
+            follower_num += n.node_type() == NodeInfoPB_NodeType_FE_FOLLOWER ? 1 : 0;
             continue;
-        }
-        if (ClusterPB::COMPUTE == cluster.type() && n.has_heartbeat_port() && n.heartbeat_port()) {
+        } else if (ClusterPB::COMPUTE == cluster.type() && n.has_heartbeat_port() &&
+                   n.heartbeat_port()) {
             continue;
         }
         ss << "check cluster params failed, node : " << proto_to_json(n);
@@ -177,8 +180,16 @@ bool ResourceManager::check_cluster_params_valid(const ClusterPB& cluster, std::
     // add_node doesn't check it
     if (check_master_num && ClusterPB::SQL == cluster.type() && master_num != 1) {
         no_err = false;
-        ss << "cluster is SQL type, must have only one master node, now master count: "
-           << master_num;
+        if (master_num && follower_num) {
+            ss << "cluster is SQL type, and use multi follower mode, cant set master node, master "
+                  "count: "
+               << master_num << " follower count: " << follower_num;
+        } else if (!follower_num && master_num != 1) {
+            ss << "cluster is SQL type, must have only one master node, now master count: "
+               << master_num;
+        } else {
+            ss << "not support SQL type mode";
+        }
         *err = ss.str();
     }
     return no_err;

diff --git a/gensrc/proto/cloud.proto b/gensrc/proto/cloud.proto
@@ -142,6 +142,7 @@ message NodeInfoPB {
         UNKNOWN = 0;
         FE_MASTER = 1;
         FE_OBSERVER = 2;
+        FE_FOLLOWER = 3;
     }
     optional string cloud_unique_id = 1;
     optional string name = 2;