From: Sage Weil <sage@redhat.com>
Date: Wed, 12 Apr 2017 20:51:57 +0000 (-0400)
Subject: osd/osd_types: fix PastIntervals::update_type()
X-Git-Tag: v12.0.3~129^2~22
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb99b51eff20b2f37d85ce483723fb2e65c12d30;p=ceph.git

osd/osd_types: fix PastIntervals::update_type()

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 0743f86304c..7ce981d1256 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -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());