]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Fix assert in the case that snapset is missing 29941/head
authorDavid Zafman <dzafman@redhat.com>
Wed, 28 Aug 2019 00:44:34 +0000 (00:44 +0000)
committerDavid Zafman <dzafman@redhat.com>
Wed, 28 Aug 2019 01:58:34 +0000 (01:58 +0000)
Fixes: https://tracker.ceph.com/issues/41517
Signed-off-by: David Zafman <dzafman@redhat.com>
src/osd/ReplicatedBackend.cc

index 02e2c48408086302c747c7638887b93051fa4955..8baec71b721f669d0c5b8d8275f89aa9e34aa6c0 100644 (file)
@@ -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(