From: John Spray <john.spray@redhat.com>
Date: Tue, 1 Jul 2014 21:04:25 +0000 (+0100)
Subject: Revert "mon: OSDMonitor: Refuse to delete CephFS pools"
X-Git-Tag: v0.80.2~14^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2056%2Fhead;p=ceph.git

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 <john.spray@redhat.com>
---

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) << "'";