Merge pull request #9101 from Abhishekvrshny/wip-15799-jewel

jewel: osd boot race with noup being set Reviewed-by: Samuel Just <sjust@redhat.com>
ceph · Jun 9, 2016 · e2a035e · e2a035e
2 parents 2c35fe7 + adfbe95
commit e2a035e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
@@ -6826,9 +6826,9 @@ void OSD::_committed_osd_maps(epoch_t first, epoch_t last, MOSDMap *m)
       }
     }
 
-    if (osdmap->test_flag(CEPH_OSDMAP_NOUP) &&
-	!newmap->test_flag(CEPH_OSDMAP_NOUP)) {
-      dout(10) << __func__ << " NOUP flag cleared in " << newmap->get_epoch()
+    if (osdmap->test_flag(CEPH_OSDMAP_NOUP) !=
+	newmap->test_flag(CEPH_OSDMAP_NOUP)) {
+      dout(10) << __func__ << " NOUP flag changed in " << newmap->get_epoch()
 	       << dendl;
       if (is_booting()) {
 	// this captures the case where we sent the boot message while