mon: require RECOVERY_DELETES be set by luminous

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 4b584e872018c845c15a46372c643303cf8e40ab..b73a7d5ceb34e20691bf282a1c8a30783efb50d1 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1776,7 +1776,8 @@ void Monitor::handle_probe_reply(MonOpRequestRef op)
           << " upgrading" << dendl;
       exit(0);
     }
-    if (!osdmon()->osdmap.test_flag(CEPH_OSDMAP_PURGED_SNAPDIRS)) {
+    if (!osdmon()->osdmap.test_flag(CEPH_OSDMAP_PURGED_SNAPDIRS) ||
+       !osdmon()->osdmap.test_flag(CEPH_OSDMAP_RECOVERY_DELETES)) {
       derr << __func__ << " existing cluster has not completed a full luminous"
           << " scrub to purge legacy snapdir objects; please scrub before"
           << " upgrading beyond luminous." << dendl;

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c236f5397f9a221700b830d7243e182d18836f9e..5dd0e3e2bb5f3a88252dc6a5327b602247dd7dbb 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -8729,10 +8729,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       goto reply;
     }
     pending_inc.new_require_osd_release = rel;
-    if (rel >= CEPH_RELEASE_LUMINOUS &&
-       !osdmap.test_flag(CEPH_OSDMAP_RECOVERY_DELETES)) {
-      return prepare_set_flag(op, CEPH_OSDMAP_RECOVERY_DELETES);
-    }
     goto update;
   } else if (prefix == "osd cluster_snap") {
     // ** DISABLE THIS FOR NOW **