]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/osd_types: fix PastIntervals::update_type()
authorSage Weil <sage@redhat.com>
Wed, 12 Apr 2017 20:51:57 +0000 (16:51 -0400)
committerSage Weil <sage@redhat.com>
Fri, 28 Apr 2017 15:30:39 +0000 (11:30 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/osd_types.cc

index 0743f86304cbf3d71d7e569e8bca7c09bcadb8e3..7ce981d1256e52a8458676513ce68542c12fc703 100644 (file)
@@ -3281,12 +3281,13 @@ void PastIntervals::update_type(bool ec_pool, bool compact)
     if (!past_intervals) {
       past_intervals.reset(new pi_simple_rep);
     } else {
+      // we never convert from compact back to classic
       assert(is_classic());
     }
   } else {
     if (!past_intervals) {
       past_intervals.reset(new pi_compact_rep);
-    } else if (!is_classic()) {
+    } else if (is_classic()) {
       auto old = std::move(past_intervals);
       past_intervals.reset(new pi_compact_rep);
       assert(old->has_full_intervals());