From: Sage Weil <sage@redhat.com>
Date: Fri, 9 Feb 2018 19:13:07 +0000 (-0600)
Subject: osd: fix PG::ch init
X-Git-Tag: v13.1.0~390^2~72
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b2935951fa0ebf4dd54d30c5545da5a25d4ead3;p=ceph.git

osd: fix PG::ch init

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 3ed8e161ec07..5f8ade3e6ff5 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3911,6 +3911,7 @@ PGRef OSD::handle_pg_create_info(OSDMapRef osdmap, const PGCreateInfo *info)
   }
 
   PGRef pg = _open_pg(createmap, pgid);
+  pg->ch = store->create_new_collection(pg->coll);
 
   pg->lock(true);
 
@@ -8011,13 +8012,13 @@ void OSD::split_pgs(
     PG* child = _make_pg(nextmap, *i);
     child->lock(true);
     out_pgs->insert(child);
+    child->ch = store->create_new_collection(child->coll);
     rctx->created_pgs.insert(child);
 
     unsigned split_bits = i->get_split_bits(pg_num);
-    dout(10) << "pg_num is " << pg_num << dendl;
-    dout(10) << "m_seed " << i->ps() << dendl;
-    dout(10) << "split_bits is " << split_bits << dendl;
-
+    dout(10) << " pg_num is " << pg_num
+	     << ", m_seed " << i->ps()
+	     << ", split_bits is " << split_bits << dendl;
     parent->split_colls(
       *i,
       split_bits,
@@ -8029,7 +8030,6 @@ void OSD::split_pgs(
       child,
       split_bits);
 
-    child->ch = store->create_new_collection(child->coll);
     child->finish_split_stats(*stat_iter, rctx->transaction);
     child->unlock();
   }
@@ -8163,10 +8163,6 @@ void OSD::dispatch_context_transaction(PG::RecoveryCtx &ctx, PG *pg,
       std::move(*ctx.transaction), TrackedOpRef(), handle);
     assert(tr == 0);
     delete (ctx.transaction);
-    for (auto pg : ctx.created_pgs) {
-      pg->ch = store->open_collection(pg->coll);
-      assert(pg->ch);
-    }
     ctx.created_pgs.clear();
     ctx.transaction = new ObjectStore::Transaction;
     ctx.on_applied = new C_Contexts(cct);
@@ -8207,10 +8203,6 @@ void OSD::dispatch_context(PG::RecoveryCtx &ctx, PG *pg, OSDMapRef curmap,
       pg->ch,
       std::move(*ctx.transaction), TrackedOpRef(),
       handle);
-    for (auto pg : ctx.created_pgs) {
-      pg->ch = store->open_collection(pg->coll);
-      assert(pg->ch);
-    }
     ctx.created_pgs.clear();
     delete (ctx.transaction);
     assert(tr == 0);