From 1f90d10b2af0127d27b47488875a2ee76d2262ec Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 1 Sep 2017 12:41:45 -0400 Subject: [PATCH] osd/PrimaryLogPG: on_local_recover: drop legacy snapset handling This was there to deal with jewel peers, which are no more. Signed-off-by: Sage Weil --- src/osd/PrimaryLogPG.cc | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 9cd58c12bc80..b2831f877d14 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -346,16 +346,9 @@ void PrimaryLogPG::on_local_recover( set snaps; dout(20) << " snapset " << recovery_info.ss << " legacy_snaps " << recovery_info.oi.legacy_snaps << dendl; - if (recovery_info.ss.is_legacy() || - recovery_info.ss.seq == 0 /* jewel osd doesn't populate this */) { - assert(recovery_info.oi.legacy_snaps.size()); - snaps.insert(recovery_info.oi.legacy_snaps.begin(), - recovery_info.oi.legacy_snaps.end()); - } else { - auto p = recovery_info.ss.clone_snaps.find(hoid.snap); - assert(p != recovery_info.ss.clone_snaps.end()); // hmm, should we warn? - snaps.insert(p->second.begin(), p->second.end()); - } + auto p = recovery_info.ss.clone_snaps.find(hoid.snap); + assert(p != recovery_info.ss.clone_snaps.end()); // hmm, should we warn? + snaps.insert(p->second.begin(), p->second.end()); dout(20) << " snaps " << snaps << dendl; snap_mapper.add_oid( recovery_info.soid, -- 2.47.3