From: Sage Weil <sage@redhat.com>
Date: Mon, 10 Sep 2018 19:32:03 +0000 (-0500)
Subject: osd: handle null pg slot on startup
X-Git-Tag: v14.0.1~211^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e6c8badcb0441f895c7bfe3897957a0a364c574;p=ceph.git

osd: handle null pg slot on startup

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 80163edabe6b..e6d1056570e2 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -2741,6 +2741,9 @@ int OSD::init()
   for (auto& shard : shards) {
     for (auto& i : shard->pg_slots) {
       PGRef pg = i.second->pg;
+      if (!pg) {
+	continue;
+      }
 
       pg->lock();
       set<pair<spg_t,epoch_t>> new_children;