From: Sage Weil Date: Tue, 11 Jun 2019 14:32:34 +0000 (-0500) Subject: mds/SnapServer: make not about pre-octopus compat code X-Git-Tag: v15.1.0~2308^2~15 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1f649c2e763eb21c47f013e1bf8b6ae24700359;p=ceph.git mds/SnapServer: make not about pre-octopus compat code Signed-off-by: Sage Weil --- diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc index 78b41bd61211..f6881d8ec1ed 100644 --- a/src/mds/SnapServer.cc +++ b/src/mds/SnapServer.cc @@ -320,6 +320,9 @@ void SnapServer::check_osd_map(bool force) map > all_purge; map > all_purged; + // NOTE: this is only needed for support during upgrades from pre-octopus, + // since starting with octopus we now get an explicit ack after we remove a + // snap. mds->objecter->with_osdmap( [this, &all_purged, &all_purge](const OSDMap& osdmap) { for (const auto& p : need_to_purge) {