fix migrate pause problem

Qihoo360 · Oct 23, 2017 · 638ec94 · 638ec94
1 parent 32618c3
commit 638ec94
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/meta/zp_meta_info_store.cc b/src/meta/zp_meta_info_store.cc
@@ -538,7 +538,7 @@ Status ZPMetaInfoStore::Refresh() {
   }
 
   LOG(INFO) << "Update node_table_ from floyd succ.";
-  NodesDebug();
+  //NodesDebug();
 
   // Update Version
   epoch_ = tmp_epoch;
@@ -662,8 +662,8 @@ Status ZPMetaInfoStore::GetNodeOffset(const ZPMeta::Node& node,
   if (node_infos_.find(ip_port) == node_infos_.end()) {
     return Status::NotFound("node not exist");
   }
-  LOG(INFO) << "node: " << node.ip() << ":" << node.port();
-  node_infos_.at(ip_port).Dump();
+  //LOG(INFO) << "node: " << node.ip() << ":" << node.port();
+  //node_infos_.at(ip_port).Dump();
   return node_infos_.at(ip_port).GetOffset(table, partition_id, noffset);
 }
 

diff --git a/src/meta/zp_meta_server.cc b/src/meta/zp_meta_server.cc
@@ -472,6 +472,7 @@ void ZPMetaServer::ProcessMigrateIfNeed() {
   }
   LOG(INFO) << "Begin Process " << diffs.size() << " migrate item";
 
+  int remain_count = diffs.size();
   for (const auto& diff : diffs) {
     // Add Slave
     s = update_thread_->PendingUpdate(
@@ -493,6 +494,7 @@ void ZPMetaServer::ProcessMigrateIfNeed() {
 
     if (!s.ok()) {
       LOG(WARNING) << "Pending migrate item failed: " << s.ToString();
+      migrate_register_->PutN(remain_count);
       break;
     }
 
@@ -522,6 +524,8 @@ void ZPMetaServer::ProcessMigrateIfNeed() {
           diff.left(),
           diff.right()),
         updates);
+
+    remain_count--;
   }
 }