From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Sep 2017 18:59:42 +0000 (-0400)
Subject: mon/OSDMonitor: drop PURGED_SNAPDIRS flag setting
X-Git-Tag: v13.0.1~861^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5e532008a65132145bd3d30297043752f58d6b2;p=ceph.git

mon/OSDMonitor: drop PURGED_SNAPDIRS flag setting

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 3f402a8d8ff2..b73eb5900f78 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3308,15 +3308,6 @@ void OSDMonitor::tick()
       do_propose = true;
     }
   }
-  if (!osdmap.test_flag(CEPH_OSDMAP_PURGED_SNAPDIRS) &&
-      osdmap.require_osd_release >= CEPH_RELEASE_LUMINOUS &&
-      mon->mgrstatmon()->is_readable() &&
-      mon->mgrstatmon()->definitely_converted_snapsets()) {
-    dout(1) << __func__ << " all snapsets converted, setting purged_snapdirs"
-	    << dendl;
-    add_flag(CEPH_OSDMAP_PURGED_SNAPDIRS);
-    do_propose = true;
-  }
 
   // mark osds down?
   if (check_failures(now))