From: David Zafman <dzafman@redhat.com>
Date: Wed, 28 Aug 2019 00:44:34 +0000 (+0000)
Subject: osd: Fix assert in the case that snapset is missing
X-Git-Tag: v15.1.0~1713^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=38ecc4e92c8982763a7073503c8f5740cd712fec;p=ceph.git

osd: Fix assert in the case that snapset is missing

Fixes: https://tracker.ceph.com/issues/41517

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc
index 02e2c4840808..8baec71b721f 100644
--- a/src/osd/ReplicatedBackend.cc
+++ b/src/osd/ReplicatedBackend.cc
@@ -1791,7 +1791,7 @@ bool ReplicatedBackend::handle_pull_response(
     if (attrset.find(SS_ATTR) != attrset.end()) {
       bufferlist ssbv = attrset.at(SS_ATTR);
       SnapSet ss(ssbv);
-      assert(ss.seq  == pi.obc->ssc->snapset.seq);
+      assert(!pi.obc->ssc->exists || ss.seq  == pi.obc->ssc->snapset.seq);
     }
     pi.recovery_info.oi = pi.obc->obs.oi;
     pi.recovery_info = recalc_subsets(