From: Samuel Just <sam.just@inktank.com>
Date: Tue, 28 Jan 2014 20:46:46 +0000 (-0800)
Subject: OSD: don't assume we have the pool in handle_pg_create
X-Git-Tag: v0.78~261^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1155%2Fhead;p=ceph.git

OSD: don't assume we have the pool in handle_pg_create

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>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e17b54d3b5ba..299ecd612884 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -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;