]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/PGMonitor: assert PGMonitor stops proposing after luminous 15584/head
authorSage Weil <sage@redhat.com>
Mon, 12 Jun 2017 13:48:48 +0000 (09:48 -0400)
committerSage Weil <sage@redhat.com>
Mon, 12 Jun 2017 13:48:48 +0000 (09:48 -0400)
One hacky exception here for the rebuild-mondb case.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/PGMonitor.cc

index fc46cbf92d0698071ff77232fff926bec9cbb7cf..6937887c5f3c084b7748b09ddf288f5256df0ef6 100644 (file)
@@ -467,6 +467,9 @@ void PGMonitor::encode_pending(MonitorDBStore::TransactionRef t)
     return;
   }
 
+  assert(mon->osdmon()->osdmap.require_osd_release < CEPH_RELEASE_LUMINOUS ||
+        pending_inc.version == 1  /* rebuild-mondb.yaml case */);
+
   version_t version = pending_inc.version;
   dout(10) << __func__ << " v " << version << dendl;
   assert(get_last_committed() + 1 == version);