Merge branch 'master' into wk_ptr

baidu · Oct 9, 2016 · e227750 · e227750
2 parents c7482c4 + 37e3d44
commit e227750
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/nameserver/chunkserver_manager.cc b/src/nameserver/chunkserver_manager.cc
@@ -578,8 +578,7 @@ void ChunkServerManager::RemoveBlock(int32_t id, int64_t block_id) {
     cs_block_map->blocks.erase(block_id);
 }
 
-void ChunkServerManager::PickRecoverBlocks(int cs_id,
-                                           std::vector<std::pair<int64_t, std::vector<std::string> > >* recover_blocks,
+void ChunkServerManager::PickRecoverBlocks(int cs_id, RecoverVec* recover_blocks,
                                            int* hi_num, bool hi_only) {
     ChunkServerInfo* cs = NULL;
     {

diff --git a/src/nameserver/chunkserver_manager.h b/src/nameserver/chunkserver_manager.h
@@ -15,6 +15,7 @@ namespace bfs {
 const double kChunkServerLoadMax = 0.999999;
 
 class BlockMappingManager;
+typedef  std::vector<std::pair<int64_t, std::vector<std::string> > > RecoverVec;
 
 class ChunkServerManager {
 public:
@@ -44,9 +45,7 @@ class ChunkServerManager {
     void AddBlock(int32_t id, int64_t block_id, bool is_recover);
     void RemoveBlock(int32_t id, int64_t block_id);
     void CleanChunkServer(ChunkServerInfo* cs, const std::string& reason);
-    void PickRecoverBlocks(int cs_id,
-                           std::vector<std::pair<int64_t, std::vector<std::string> > >* recover_blocks,
-                           int* hi_num, bool hi_only);
+    void PickRecoverBlocks(int cs_id,  RecoverVec* recover_blocks, int* hi_num, bool hi_only);
     void GetStat(int32_t* w_qps, int64_t* w_speed, int32_t* r_qps,
                  int64_t* r_speed, int64_t* recover_speed);
     StatusCode ShutdownChunkServer(const::google::protobuf::RepeatedPtrField<std::string>& chunkserver_address);

diff --git a/src/nameserver/nameserver_impl.cc b/src/nameserver/nameserver_impl.cc
@@ -291,7 +291,7 @@ void NameServerImpl::BlockReport(::google::protobuf::RpcController* controller,
 
     // recover replica
     if (recover_mode_ != kStopRecover) {
-        std::vector<std::pair<int64_t, std::vector<std::string> > > recover_blocks;
+        RecoverVec recover_blocks;
         int hi_num = 0;
         chunkserver_manager_->PickRecoverBlocks(cs_id, &recover_blocks,
                                                 &hi_num, recover_mode_ == kHiOnly);