From: Sage Weil <sage@redhat.com>
Date: Thu, 18 May 2017 19:32:26 +0000 (-0400)
Subject: mon/OSDMonitor: fix bad update_pending_pgs call
X-Git-Tag: v12.1.0~288^2~75
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5a700a4699749975b0d710ffd112a452be5b7c2d;p=ceph-ci.git

mon/OSDMonitor: fix bad update_pending_pgs call

We are not persisiting the updated creating_pgs here; this is bad!  I'm
not sure why it was there to begin with?

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 015fbd48717..9aa7ea6df5e 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -426,7 +426,6 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap)
     }
     if (mon->monmap->get_required_features().contains_all(
           ceph::features::mon::FEATURE_LUMINOUS)) {
-      creating_pgs = update_pending_pgs(inc);
       for (const auto &osd_state : inc.new_state) {
 	if (osd_state.second & CEPH_OSD_UP) {
 	  // could be marked up *or* down, but we're too lazy to check which