From 318e208ab6cf2262d5b9954efb11bd3e1fafac32 Mon Sep 17 00:00:00 2001
From: Samuel Just <sam.just@inktank.com>
Date: Tue, 28 Jan 2014 12:46:46 -0800
Subject: [PATCH] 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>
---
 src/osd/OSD.cc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index e17b54d3b5b..299ecd61288 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;