bugfix: make mario consumer add command after auth command

hcg2aptx · Nov 10, 2015 · e113241 · e113241
1 parent 24e3deb
commit e113241
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/conf/pika.conf b/conf/pika.conf
@@ -13,7 +13,7 @@ write_buffer_size : 268435456
 # Pika timeout
 timeout : 60
 # Requirepass
-requirepass : 
+requirepass : abc
 # Dump Prefix
 dump_prefix : 
 # daemonize  [yes | no]

diff --git a/include/pika_conn.h b/include/pika_conn.h
@@ -38,6 +38,7 @@ class PikaConn
     int fd() { return fd_; };
     int role() {return role_; };
     void set_role(int role) { MutexLock l(&mutex_); role_ = role; }
+    void set_role_nolock(int role) { role_ = role; }
     std::string ip_port() { return ip_port_; };
 //    struct timeval  lastinteraction() { return lastinteraction_; };
 //    void UpdateLastInteraction() { gettimeofday(&lastinteraction_, NULL); };

diff --git a/src/pika_conn.cc b/src/pika_conn.cc
@@ -445,6 +445,7 @@ int PikaConn::DoCmd() {
                 char buf[32];
                 ll2string(buf, sizeof(buf), fd_);
                 argv_.push_back(std::string(buf));
+                mutex_.Lock();
             }
             pthread_rwlock_rdlock(g_pikaServer->rwlock());
 
@@ -493,7 +494,10 @@ int PikaConn::DoCmd() {
         LOG(INFO) << "Authentication required, close connection";
         cmd_ret = -2;
     }
-    if (role_ != PIKA_MASTER && !(role_ == PIKA_SLAVE && opt == "ping")) {
+    if (opt == "pikasync") {
+        wbuf_ = sdscatlen(wbuf_, ret.data(), ret.size());
+        mutex_.Unlock();
+    } else if (role_ != PIKA_MASTER && !(role_ == PIKA_SLAVE && opt == "ping")) {
         if (role_ == PIKA_SLAVE) {
             MutexLock l(&mutex_);
             wbuf_ = sdscatlen(wbuf_, ret.data(), ret.size());

diff --git a/src/pika_server.cc b/src/pika_server.cc
@@ -435,7 +435,7 @@ int PikaServer::TrySync(/*std::string &ip, std::string &str_port,*/ int fd, uint
             iter_cl->second.role = PIKA_SLAVE;
         }
         }
-        conn->set_role(PIKA_SLAVE);
+        conn->set_role_nolock(PIKA_SLAVE);
         return PIKA_REP_STRATEGY_PSYNC;
     } else {
         return PIKA_REP_STRATEGY_ERROR;