From: Kefu Chai <kchai@redhat.com>
Date: Fri, 19 May 2017 09:53:27 +0000 (+0800)
Subject: mon/PGMonitor: do not create/encode pending if luminous
X-Git-Tag: ses5-milestone6~8^2~19^2~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11d1a4d3efbb315fd74b938aa0d13cbd8995a0b2;p=ceph.git

mon/PGMonitor: do not create/encode pending if luminous

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index fd586b4d369..4cdc81aa2c8 100644
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -280,6 +280,8 @@ void PGMonitor::handle_osd_timeouts()
 
 void PGMonitor::create_pending()
 {
+  if (did_delete)
+    return;
   do_delete = false;
   pending_inc = PGMap::Incremental();
   pending_inc.version = pg_map.version + 1;
@@ -446,6 +448,9 @@ void PGMonitor::apply_pgmap_delta(bufferlist& bl)
 
 void PGMonitor::encode_pending(MonitorDBStore::TransactionRef t)
 {
+  if (did_delete)
+    return;
+
   string prefix = pgmap_meta_prefix;
   if (do_delete) {
     dout(1) << __func__ << " clearing pgmap data at v" << pending_inc.version