mon: Fix bug that would make OSDMon over-excited about pushing new maps

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 2b0b803309f373e8170b1b9cd05d2a2842fdeae9..9839b1ada478238c1728744fcdc65cd4b3f41b5d 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -847,7 +847,8 @@ void OSDMonitor::tick()
   }
 
   //if map full setting has changed, get that info out there!
-  if ((pending_inc.new_flags ^ osdmap.flags) & CEPH_OSDMAP_FULL) {
+  if (pending_inc.new_flags != -1 &&
+      (pending_inc.new_flags ^ osdmap.flags) & CEPH_OSDMAP_FULL) {
     dout(1) << "New setting for CEPH_OSDMAP_FULL -- doing propose" << dendl;
     do_propose = true;
   }