From 3292d43192ffeb7fbf385e803c7e6e0c3c3891d9 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Mon, 16 Apr 2018 20:13:37 -0700 Subject: [PATCH] mds: unset deleted vars in shutdown_pass So future passes do not try to delete again. Fixes: http://tracker.ceph.com/issues/23766 Signed-off-by: Patrick Donnelly --- src/mds/MDCache.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index e8529969ea5..6803eeadee2 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -7818,11 +7818,15 @@ bool MDCache::shutdown_pass() } assert(subtrees.empty()); - if (myin) + if (myin) { remove_inode(myin); + assert(!myin); + } - if (global_snaprealm) + if (global_snaprealm) { remove_inode(global_snaprealm->inode); + global_snaprealm = nullptr; + } // done! dout(2) << "shutdown done." << dendl; -- 2.47.3