bugfix: once binlogsender disconnect with receiver, it will never rec…

…onnect success
buzhimingyonghu · May 19, 2017 · b202a0c · b202a0c
1 parent cc88381
commit b202a0c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/pika_server.cc b/src/pika_server.cc
@@ -587,7 +587,8 @@ bool PikaServer::ShouldAccessConnAsMaster(const std::string& ip) {
   slash::RWLock l(&state_protector_, false);
   DLOG(INFO) << "ShouldAccessConnAsMaster, repl_state_: " << repl_state_ << " ip: " << ip << " master_ip: " << master_ip_;
 //  if (repl_state_ != PIKA_REPL_NO_CONNECT && repl_state_ != PIKA_REPL_WAIT_DBSYNC && ip == master_ip_) {
-  if (repl_state_ == PIKA_REPL_CONNECTING && ip == master_ip_) {
+  if ((repl_state_ == PIKA_REPL_CONNECTING || repl_state_ == PIKA_REPL_CONNECTED) &&
+      ip == master_ip_) {
     return true;
   }
   return false;