From: Jie Wang <jie.wang@kylin-cloud.com>
Date: Mon, 21 Nov 2016 03:41:51 +0000 (+0000)
Subject:     osd/OSD: cleanup on C_CompleteSplits::finish(), delete useless codes
X-Git-Tag: v11.1.0~138^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=abd29c6160904313c7132a1b28d81a8c3b2e1901;p=ceph.git

osd/OSD: cleanup on C_CompleteSplits::finish(), delete useless codes

    Signed-off-by: Jie Wang <jie.wang@kylin-cloud.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 2cde841e4368..bdb6af2c87c8 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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());