add function DeactivateSyncSlaveDB (#2801)

Co-authored-by: cheniujh <1271435567@qq.com>
OpenAtomFoundation · Jul 18, 2024 · f4cfbde · f4cfbde
1 parent 057812f
commit f4cfbde
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/include/pika_rm.h b/include/pika_rm.h
@@ -166,6 +166,7 @@ class PikaReplicaManager {
   void RmStatus(std::string* debug_info);
   pstd::Status CheckDBRole(const std::string& table, int* role);
   pstd::Status LostConnection(const std::string& ip, int port);
+  pstd::Status DeactivateSyncSlaveDB(const std::string& ip, int port);
 
   // Update binlog win and try to send next binlog
   pstd::Status UpdateSyncBinlogStatus(const RmNode& slave, const LogOffset& offset_start, const LogOffset& offset_end);

diff --git a/src/pika_rm.cc b/src/pika_rm.cc
@@ -726,6 +726,17 @@ bool PikaReplicaManager::CheckSlaveDBState(const std::string& ip, const int port
   return true;
 }
 
+Status PikaReplicaManager::DeactivateSyncSlaveDB(const std::string& ip, int port) {
+  std::shared_lock l(dbs_rw_);
+  for (auto& iter : sync_slave_dbs_) {
+    std::shared_ptr<SyncSlaveDB> db = iter.second;
+    if (db->MasterIp() == ip && db->MasterPort() == port) {
+      db->Deactivate();
+    }
+  }
+  return Status::OK();
+}
+
 Status PikaReplicaManager::LostConnection(const std::string& ip, int port) {
   std::shared_lock l(dbs_rw_);
   for (auto& iter : sync_master_dbs_) {

diff --git a/src/pika_server.cc b/src/pika_server.cc
@@ -659,7 +659,7 @@ void PikaServer::RemoveMaster() {
 
     if (!master_ip_.empty() && master_port_ != -1) {
       g_pika_rm->CloseReplClientConn(master_ip_, master_port_ + kPortShiftReplServer);
-      g_pika_rm->LostConnection(master_ip_, master_port_);
+      g_pika_rm->DeactivateSyncSlaveDB(master_ip_, master_port_);
       UpdateMetaSyncTimestampWithoutLock();
       LOG(INFO) << "Remove Master Success, ip_port: " << master_ip_ << ":" << master_port_;
     }