From b1a5bff4a888d69bc783d8ffae855c639fb98969 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 11 Jun 2019 09:33:51 -0500 Subject: [PATCH] osd/PrimaryLogPG: make best effort to sanitize clones on copy-from Signed-off-by: Sage Weil --- src/osd/PrimaryLogPG.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 102a1186f87..eb1eeab046d 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -9009,7 +9009,8 @@ void PrimaryLogPG::process_copy_chunk(hobject_t oid, ceph_tid_t tid, int r) // verify snap hasn't been deleted vector::iterator p = cop->results.snaps.begin(); while (p != cop->results.snaps.end()) { - if (pool.info.is_removed_snap(*p)) { + // make best effort to sanitize snaps/clones. + if (get_osdmap()->in_removed_snaps_queue(info.pgid.pgid.pool(), *p)) { dout(10) << __func__ << " clone snap " << *p << " has been deleted" << dendl; for (vector::iterator q = p + 1; -- 2.39.5