]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
OSD: don't assume we have the pool in handle_pg_create 1155/head
authorSamuel Just <sam.just@inktank.com>
Tue, 28 Jan 2014 20:46:46 +0000 (12:46 -0800)
committerSamuel Just <sam.just@inktank.com>
Tue, 28 Jan 2014 21:05:49 +0000 (13:05 -0800)
The pool may have been removed since the creation message
was sent.  Previously, role would end up as -1 and this
path would be avoided.

Fixes: 7190
Introduced in 268ae82ac3fe7b541c450aae168dcf9fa7294508
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/OSD.cc

index e17b54d3b5bacd8eff06dbfa2d9d26b8b3590e9f..299ecd61288425e664b3842499952a6d3ebee816 100644 (file)
@@ -5947,6 +5947,10 @@ void OSD::handle_pg_create(OpRequestRef op)
       dout(20) << "ignoring localized pg " << pgid << dendl;
       continue;
     }
+    if (!osdmap->have_pg_pool(pgid.pool())) {
+      dout(20) << "ignoring pg on deleted pool " << pgid << dendl;
+      continue;
+    }
 
     dout(20) << "mkpg " << pgid << " e" << created << dendl;