fix: slotmigrate return not correct

src/pika_migrate_thread.cc

@@ -654,11 +654,12 @@ int PikaMigrateThread::ReqMigrateOne(const std::string& key, const std::shared_p
   key_type = storage::DataTypeToTag(type);
   if (type == storage::DataType::kNones) {
     LOG(WARNING) << "PikaMigrateThread::ReqMigrateOne key: " << key << " type: " << static_cast<int>(type) << " is  illegal";
-    return -1;
+    return 0;
   }
+
   if (slot_id != slot_id_) {
     LOG(WARNING) << "PikaMigrateThread::ReqMigrateOne Slot : " << slot_id << " is not the migrating slot:" << slot_id_;
-    return -2;
+    return -1;
   }
 
   // if the migrate thread exit, start it
@@ -675,7 +676,7 @@ int PikaMigrateThread::ReqMigrateOne(const std::string& key, const std::shared_p
       is_migrating_ = true;
       usleep(100);
     }
-  } else {
+  }
     // check the key is migrating
     std::pair<const char, std::string> kpair = std::make_pair(key_type, key);
     if (IsMigrating(kpair)) {
@@ -686,7 +687,6 @@ int PikaMigrateThread::ReqMigrateOne(const std::string& key, const std::shared_p
       mgrtone_queue_.emplace_back(kpair);
       NotifyRequestMigrate();
     }
-  }
 
   return 1;
 }
@@ -934,7 +934,9 @@ void *PikaMigrateThread::ThreadMain() {
     {
       std::unique_lock lw(workers_mutex_);
       while (!should_exit_ && is_task_success_ && send_num_ != response_num_) {
-        workers_cond_.wait(lw);
+        if (workers_cond_.wait_for(lw, std::chrono::minutes(3)) == std::cv_status::timeout) {
+          break;
+        }
       }
     }
     LOG(INFO) << "PikaMigrateThread::ThreadMain send_num:" << send_num_ << " response_num:" << response_num_;

src/pika_slot_command.cc

@@ -1440,7 +1440,6 @@ void SlotsMgrtExecWrapperCmd::Do() {
   int ret = g_pika_server->SlotsMigrateOne(key_, db_);
   switch (ret) {
     case 0:
-    case -2:
       res_.AppendInteger(0);
       res_.AppendInteger(0);
       return;