]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/OSD: cleanup on C_CompleteSplits::finish(), delete useless codes
authorJie Wang <jie.wang@kylin-cloud.com>
Mon, 21 Nov 2016 03:41:51 +0000 (03:41 +0000)
committerJie Wang <jie.wang@kylin-cloud.com>
Mon, 21 Nov 2016 05:47:00 +0000 (05:47 +0000)
Signed-off-by: Jie Wang <jie.wang@kylin-cloud.com>
src/osd/OSD.cc

index 2cde841e4368c17a734a5d95f9ef86727590f519..bdb6af2c87c80953e531a3bd493f68b7711fa474 100644 (file)
@@ -9015,7 +9015,6 @@ struct C_CompleteSplits : public Context {
     if (osd->is_stopping())
       return;
     PG::RecoveryCtx rctx = osd->create_context();
-    set<spg_t> to_complete;
     for (set<boost::intrusive_ptr<PG> >::iterator i = pgs.begin();
         i != pgs.end();
         ++i) {
@@ -9023,15 +9022,14 @@ struct C_CompleteSplits : public Context {
       (*i)->lock();
       osd->add_newly_split_pg(&**i, &rctx);
       if (!((*i)->deleting)) {
+        set<spg_t> to_complete;
         to_complete.insert((*i)->info.pgid);
         osd->service.complete_split(to_complete);
       }
       osd->pg_map_lock.put_write();
       osd->dispatch_context_transaction(rctx, &**i);
-       to_complete.insert((*i)->info.pgid);
       (*i)->unlock();
       osd->wake_pg_waiters((*i)->info.pgid);
-      to_complete.clear();
     }
 
     osd->dispatch_context(rctx, 0, osd->service.get_osdmap());