]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG::finish_promote: soid.clone may have been trimed, fix assert
authorSamuel Just <sam.just@inktank.com>
Wed, 9 Apr 2014 22:57:37 +0000 (15:57 -0700)
committerSamuel Just <sam.just@inktank.com>
Mon, 14 Apr 2014 23:55:16 +0000 (16:55 -0700)
Signed-off-by: Samuel Just <sam.just@inktank.com>
src/osd/ReplicatedPG.cc

index e8b23fae785eb420d7d13cec28c1d51a7bf0e759..d8e092fc571e6fff11339646025b0512c49e9f30 100644 (file)
@@ -5830,7 +5830,7 @@ void ReplicatedPG::finish_promote(int r, OpRequestRef op,
        vector<snapid_t>::iterator p = snapset.snaps.begin();
        while (p != snapset.snaps.end() && *p > soid.snap)
          ++p;
-       assert(p != snapset.snaps.end() && *p == soid.snap);
+       assert(p != snapset.snaps.end());
        do {
          tctx->new_obs.oi.snaps.push_back(*p);
          ++p;