From: John Spray <john.spray@redhat.com>
Date: Tue, 29 Sep 2015 21:45:03 +0000 (+0100)
Subject: mds: fix SnapServer crash on deleted pool
X-Git-Tag: v9.1.0~19^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F6128%2Fhead;p=ceph.git

mds: fix SnapServer crash on deleted pool

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc
index b5884fab7dce1..70069092c4118 100644
--- a/src/mds/SnapServer.cc
+++ b/src/mds/SnapServer.cc
@@ -265,6 +265,12 @@ void SnapServer::check_osd_map(bool force)
        ++p) {
     int id = p->first;
     const pg_pool_t *pi = osdmap->get_pg_pool(id);
+    if (pi == NULL) {
+      // The pool is gone.  So are the snapshots.
+      all_purged[id] = std::vector<snapid_t>(p->second.begin(), p->second.end());
+      continue;
+    }
+
     for (set<snapid_t>::iterator q = p->second.begin();
 	 q != p->second.end();
 	 ++q) {