Add readonly mode and allow_free_node

HaoXuan40404 · Mar 29, 2024 · c47e40f · c47e40f
1 parent 5627584
commit c47e40f
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 3 deletions.
diff --git a/bcos-gateway/bcos-gateway/GatewayFactory.cpp b/bcos-gateway/bcos-gateway/GatewayFactory.cpp
@@ -682,7 +682,10 @@ std::shared_ptr<Gateway> GatewayFactory::buildGateway(GatewayConfig::Ptr _config
         {
             gatewayNodeManager =
                 std::make_shared<GatewayNodeManager>(_config->uuid(), pubHex, keyFactory, service);
-            amop = buildLocalAMOP(service, pubHex);
+            if (!_config->readonly())
+            {
+                amop = buildLocalAMOP(service, pubHex);
+            }
         }
         else
         {
@@ -697,9 +700,26 @@ std::shared_ptr<Gateway> GatewayFactory::buildGateway(GatewayConfig::Ptr _config
                 gatewayNodeManager = std::make_shared<ProGatewayNodeManager>(
                     _config->uuid(), pubHex, keyFactory, service);
             }
-            amop = buildAMOP(service, pubHex);
+
+            if (!_config->readonly())
+            {
+                amop = buildAMOP(service, pubHex);
+            }
+            else
+            {
+                // register a null amop message handler
+                service->registerHandlerByMsgType(GatewayMessageType::AMOPMessageType,
+                    [](const bcos::gateway::NetworkException& _e,
+                        const bcos::gateway::P2PSession::Ptr& session,
+                        const std::shared_ptr<bcos::gateway::P2PMessage>& message) {
+                        // 只读模式下, 不处理其它节点的amop消息
+                        // In read-only mode, AMOP messages from other nodes are not processed
+                        return;
+                    });
+            }
         }
 
+
         std::shared_ptr<ratelimiter::GatewayRateLimiter> gatewayRateLimiter;
         if (_config->rateLimiterConfig().enable)
         {
@@ -710,6 +730,10 @@ std::shared_ptr<Gateway> GatewayFactory::buildGateway(GatewayConfig::Ptr _config
         // init Gateway
         auto gateway = std::make_shared<Gateway>(
             _config, service, gatewayNodeManager, amop, gatewayRateLimiter, _gatewayServiceName);
+        if (_config->readonly())
+        {
+            gateway->enableReadOnlyMode();
+        }
         auto gatewayNodeManagerWeakPtr = std::weak_ptr<GatewayNodeManager>(gatewayNodeManager);
         // register disconnect handler
         service->registerDisconnectHandler(

diff --git a/bcos-gateway/bcos-gateway/libp2p/Service.h b/bcos-gateway/bcos-gateway/libp2p/Service.h
@@ -254,6 +254,7 @@ class Service : public P2PInterface, public std::enable_shared_from_this<Service
         m_beforeMessageHandler;
 
     std::function<std::optional<bcos::Error>(SessionFace::Ptr, Message::Ptr)> m_onMessageHandler;
+    bcos::LogLevel m_connectionLogLevel = bcos::LogLevel::WARNING;
 };
 
 }  // namespace gateway

diff --git a/bcos-sync/bcos-sync/BlockSync.cpp b/bcos-sync/bcos-sync/BlockSync.cpp
@@ -428,7 +428,8 @@ void BlockSync::onPeerStatus(NodeIDPtr _nodeID, BlockSyncMsgInterface::Ptr _sync
     // receive peer not exist in the group
     // Note: only should reject syncStatus from the node whose blockNumber falling behind of this
     // node
-    if (!m_config->existsInGroup(_nodeID) && _syncMsg->number() <= m_config->blockNumber())
+    if (!m_allowFreeNode && !m_config->existsInGroup(_nodeID) &&
+        _syncMsg->number() <= m_config->blockNumber())
     {
         return;
     }

diff --git a/bcos-tool/bcos-tool/NodeConfig.cpp b/bcos-tool/bcos-tool/NodeConfig.cpp
@@ -581,6 +581,7 @@ void NodeConfig::loadSecurityConfig(boost::property_tree::ptree const& _pt)
 void NodeConfig::loadSealerConfig(boost::property_tree::ptree const& _pt)
 {
     m_minSealTime = checkAndGetValue(_pt, "consensus.min_seal_time", "500");
+    m_allowFreeNode = _pt.get<bool>("sync.allow_free_node", false);
     if (m_minSealTime <= 0 || m_minSealTime > DEFAULT_MAX_SEAL_TIME_MS)
     {
         BOOST_THROW_EXCEPTION(InvalidConfig() << errinfo_comment(

diff --git a/bcos-tool/bcos-tool/NodeConfig.h b/bcos-tool/bcos-tool/NodeConfig.h
@@ -120,6 +120,7 @@ class NodeConfig
     std::string const& password() const { return m_password; }
 
     size_t minSealTime() const { return m_minSealTime; }
+    bool allowFreeNodeSync() const { return m_allowFreeNode; }
     size_t checkPointTimeoutInterval() const { return m_checkPointTimeoutInterval; }
     size_t pipelineSize() const { return m_pipelineSize; }
 
@@ -329,6 +330,7 @@ class NodeConfig
 
     // sealer configuration
     size_t m_minSealTime = 0;
+    bool m_allowFreeNode = false;
     size_t m_checkPointTimeoutInterval;
     size_t m_pipelineSize = 50;