when receive unrecognizable binlog, disconnect the connection without…

… change the status to SyncError (OpenAtomFoundation#331)
lxq2537664558 · Aug 20, 2018 · 58f149c · 58f149c
1 parent 469f131
commit 58f149c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 27 deletions.
diff --git a/include/pika_server.h b/include/pika_server.h
@@ -187,7 +187,6 @@ class PikaServer {
 
   void DoTimingTask();
 
-  slash::Mutex slaveping_protector_;
   PikaSlavepingThread* ping_thread_;
 
   /*

diff --git a/src/pika_new_master_conn.cc b/src/pika_new_master_conn.cc
@@ -188,7 +188,6 @@ pink::ReadStatus PikaNewMasterConn::GetRequest() {
 
   if (type != kTypeAuth && type != kTypeBinlog) {
     LOG(INFO) << "Unrecognizable Type: " << type << " maybe identify binlog type error";
-    g_pika_server->SyncError();
     return pink::kParseError;
   }
 

diff --git a/src/pika_server.cc b/src/pika_server.cc
@@ -128,11 +128,7 @@ PikaServer::~PikaServer() {
   }
 
   delete pika_trysync_thread_;
-  {
-    slash::MutexLock l(&slaveping_protector_);
-    delete ping_thread_;
-    ping_thread_ = NULL;
-  }
+  delete ping_thread_;
   delete pika_binlog_receiver_thread_;
   delete pika_pubsub_thread_;
 
@@ -704,17 +700,14 @@ void PikaServer::SyncError() {
   slash::RWLock l(&state_protector_, true);
   repl_state_ = PIKA_REPL_ERROR;
   }
-  {
-    slash::MutexLock l(&slaveping_protector_);
-    if (ping_thread_ != NULL) {
-      int err = ping_thread_->StopThread();
-      if (err != 0) {
-        std::string msg = "can't join thread " + std::string(strerror(err));
-        LOG(WARNING) << msg;
-      }
-      delete ping_thread_;
-      ping_thread_ = NULL;
+  if (ping_thread_ != NULL)  {
+    int err = ping_thread_->StopThread();
+    if (err != 0) {
+      std::string msg = "can't join thread " + std::string(strerror(err));
+      LOG(WARNING) << msg;
     }
+    delete ping_thread_;
+    ping_thread_ = NULL;
   }
   LOG(WARNING) << "Sync error, set repl_state to PIKA_REPL_ERROR";
 }
@@ -733,17 +726,14 @@ void PikaServer::RemoveMaster() {
   master_ip_ = "";
   master_port_ = -1;
   }
-  {
-    slash::MutexLock l(&slaveping_protector_);
-    if (ping_thread_ != NULL) {
-      int err = ping_thread_->StopThread();
-      if (err != 0) {
-        std::string msg = "can't join thread " + std::string(strerror(err));
-        LOG(WARNING) << msg;
-      }
-      delete ping_thread_;
-      ping_thread_ = NULL;
+  if (ping_thread_ != NULL) {
+    int err = ping_thread_->StopThread();
+    if (err != 0) {
+      std::string msg = "can't join thread " + std::string(strerror(err));
+      LOG(WARNING) << msg;
     }
+    delete ping_thread_;
+    ping_thread_ = NULL;
   }
   {
   slash::RWLock l(&state_protector_, true);
-Original file line number
+Diff line change
@@ Expand Up / @@ -187,7 +187,6 @@ class PikaServer { @@
       void DoTimingTask();
-      slash::Mutex slaveping_protector_;
       PikaSlavepingThread* ping_thread_;
       /*
@@ Expand Down @@