]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: handle null pg slot on startup
authorSage Weil <sage@redhat.com>
Mon, 10 Sep 2018 19:32:03 +0000 (14:32 -0500)
committerSage Weil <sage@redhat.com>
Mon, 17 Sep 2018 17:52:46 +0000 (12:52 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/OSD.cc

index 80163edabe6b57b94c647469cee02ea85e3f57bf..e6d1056570e27e69bdb28bee6b5a9d495ebde93f 100644 (file)
@@ -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;