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 557b035c0dbac8546a65c50436b0b4e279dc3591..b5884fab7dce14cfa11a42b2f080bfdfbb7b9c0b 100644 (file)
--- 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();