From 04c09ac62f21f59f9db68fedc5ca78df27030d9f Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 29 Sep 2015 22:45:03 +0100 Subject: [PATCH] mds: fix SnapServer crash on deleted pool Signed-off-by: John Spray --- src/mds/SnapServer.cc | 6 ++++++ 1 file changed, 6 insertions(+) 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(p->second.begin(), p->second.end()); + continue; + } + for (set::iterator q = p->second.begin(); q != p->second.end(); ++q) { -- 2.47.3