]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: skip new pgs for prime_pg_temp 14913/head
authorSage Weil <sage@redhat.com>
Wed, 3 May 2017 01:42:34 +0000 (20:42 -0500)
committerSage Weil <sage@redhat.com>
Wed, 3 May 2017 01:42:34 +0000 (20:42 -0500)
If the pg didn't previously exist we don't need to (and can't) prime
pg_temp for it.  This avoids crashing on mapping.get().

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc

index 08f616dc91f5bbc6b5bca82838e7a2b812c4eb89..5914f066019eb1a639a2471f5da8909ee5ef6da0 100644 (file)
@@ -1076,6 +1076,9 @@ void OSDMonitor::prime_pg_temp(
       return;
     }
   }
+  if (!osdmap.have_pg_pool(pgid.pool())) {
+    return;
+  }
 
   vector<int> up, acting;
   mapping.get(pgid, &up, nullptr, &acting, nullptr);