From: Sage Weil <sage@redhat.com>
Date: Mon, 12 Jun 2017 13:48:48 +0000 (-0400)
Subject: mon/PGMonitor: assert PGMonitor stops proposing after luminous
X-Git-Tag: v12.1.0~179^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5325460b3921d0e10074f2dc852fee330ac603c5;p=ceph.git

mon/PGMonitor: assert PGMonitor stops proposing after luminous

One hacky exception here for the rebuild-mondb case.

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

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index fc46cbf92d069..6937887c5f3c0 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -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);