From: John Spray <john.spray@redhat.com>
Date: Wed, 15 Jul 2015 13:12:41 +0000 (+0100)
Subject: mds: make SnapServer handle old osd maps
X-Git-Tag: v9.1.0~406^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d563fffaa86f5e7cd02ed6abd9190d0e8ecd22b8;p=ceph.git

mds: make SnapServer handle old osd maps

(i.e. those missing pools mentioned in the mdsmap)

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

diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc
index 557b035c0dba..b5884fab7dce 100644
--- a/src/mds/SnapServer.cc
+++ b/src/mds/SnapServer.cc
@@ -46,6 +46,11 @@ void SnapServer::reset_state()
          p != mds->mdsmap->get_data_pools().end();
          ++p) {
       const pg_pool_t *pi = osdmap->get_pg_pool(*p);
+      if (!pi) {
+        // If pool isn't in OSDMap yet then can't have any snaps needing
+        // removal, skip.
+        continue;
+      }
       if (!pi->removed_snaps.empty() &&
           pi->removed_snaps.range_end() > first_free)
         first_free = pi->removed_snaps.range_end();