]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/OSD: cleanup on PeeringWQ::_dequeue(), remove unnecessary variable 12117/head
authorJie Wang <jie.wang@kylin-cloud.com>
Tue, 22 Nov 2016 02:36:23 +0000 (02:36 +0000)
committerJie Wang <jie.wang@kylin-cloud.com>
Tue, 22 Nov 2016 02:45:13 +0000 (02:45 +0000)
Signed-off-by: Jie Wang <jie.wang@kylin-cloud.com>
src/osd/OSD.cc

index 2cde841e4368c17a734a5d95f9ef86727590f519..b43b2d3ee689208c2fb2cdac992137d9da18b786 100644 (file)
@@ -9422,7 +9422,6 @@ int OSD::init_op_flags(OpRequestRef& op)
 }
 
 void OSD::PeeringWQ::_dequeue(list<PG*> *out) {
-  set<PG*> got;
   for (list<PG*>::iterator i = peering_queue.begin();
       i != peering_queue.end() &&
       out->size() < osd->cct->_conf->osd_peering_wq_batch_size;
@@ -9431,9 +9430,8 @@ void OSD::PeeringWQ::_dequeue(list<PG*> *out) {
           ++i;
         } else {
           out->push_back(*i);
-          got.insert(*i);
           peering_queue.erase(i++);
         }
   }
-  in_use.insert(got.begin(), got.end());
+  in_use.insert(out->begin(), out->end());
 }