From 6a0dd1be909b423f52e2c7f11531b278dc8838ae Mon Sep 17 00:00:00 2001 From: John Spray Date: Tue, 1 Jul 2014 22:04:25 +0100 Subject: [PATCH] Revert "mon: OSDMonitor: Refuse to delete CephFS pools" This reverts commit c7d265a9b276aad5caf9b35f3ce8bc7bdd169f0f. Because this pre-dates the `fs rm` command, this change was preventing firefly users from ever deleting their filesystem pools. Fixes: #8010 Signed-off-by: John Spray --- src/mon/OSDMonitor.cc | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index c949a8b4f22a..dca75415b68c 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -5581,14 +5581,6 @@ int OSDMonitor::_check_remove_pool(int64_t pool, const pg_pool_t *p, { string poolstr = osdmap.get_pool_name(pool); - // If the Pool is in use by CephFS, refuse to delete it - MDSMap const &pending_mdsmap = mon->mdsmon()->pending_mdsmap; - if (pending_mdsmap.is_data_pool(pool) || - pending_mdsmap.get_metadata_pool() == pool) { - *ss << "pool '" << poolstr << "' is in use by CephFS"; - return -EBUSY; - } - if (p->tier_of >= 0) { *ss << "pool '" << poolstr << "' is a tier of '" << osdmap.get_pool_name(p->tier_of) << "'"; -- 2.47.3