refine

Author: xzhangxian1008

include/pingcap/kv/Rpc.h

@@ -51,7 +51,6 @@ struct RpcClient
     std::chrono::minutes scan_interval = rpc_conn_check_interval;
     std::atomic<bool> stopped = false;
     std::condition_variable scan_cv;
-    std::vector<std::string> invalid_conns;
 
     RpcClient() = default;
 
@@ -66,22 +65,19 @@ struct RpcClient
 
     void update(const ClusterConfig & config_)
     {
-        std::lock_guard<std::mutex> lk(mutex);
+        std::unique_lock lk(mutex);
         config = config_;
         conns.clear();
-        invalid_conns.clear();
     }
 
     void run();
 
     void stop();
 
-    void scanConns();
+    void scanAndRemoveInvalidConns();
 
     void removeConn(const std::string & addr);
 
-    void removeInvalidConns();
-
     ConnArrayPtr getConnArray(const std::string & addr);
 
     ConnArrayPtr createConnArray(const std::string & addr);

src/kv/Rpc.cc

@@ -70,8 +70,7 @@ void RpcClient::run()
 
         try
         {
-            scanConns();
-            removeInvalidConns();
+            scanAndRemoveInvalidConns();
         }
         catch (...)
         {
@@ -86,7 +85,7 @@ void RpcClient::stop()
     scan_cv.notify_all();
 }
 
-void RpcClient::scanConns()
+void RpcClient::scanAndRemoveInvalidConns()
 {
     std::vector<std::string> conn_snapshot;
     {
@@ -100,35 +99,27 @@ void RpcClient::scanConns()
         return;
 
     const auto store_addrs = getStoreAddresses(pd_client);
-
-    std::lock_guard<std::mutex> lock(mutex);
+    std::vector<std::string> invalid_conns;
     for (const auto & addr : conn_snapshot)
     {
         if (store_addrs.find(addr) == store_addrs.end())
             invalid_conns.push_back(addr);
     }
-}
-
-void RpcClient::removeConn(const std::string & addr)
-{
-    std::lock_guard<std::mutex> lock(mutex);
-    if (conns.erase(addr))
-        log->information("delete invalid addr: " + addr);
-}
 
-void RpcClient::removeInvalidConns()
-{
-    std::lock_guard<std::mutex> lock(mutex);
     if (invalid_conns.empty())
         return;
 
     for (const auto & addr : invalid_conns)
     {
-        if (conns.erase(addr))
-            log->information("delete invalid addr: " + addr);
+        removeConn(addr);
     }
+}
 
-    invalid_conns.clear();
+void RpcClient::removeConn(const std::string & addr)
+{
+    std::lock_guard<std::mutex> lock(mutex);
+    if (conns.erase(addr))
+        log->information("delete invalid addr: " + addr);
 }
 
 ConnArrayPtr RpcClient::getConnArray(const std::string & addr)