From: Sage Weil <sage@inktank.com>
Date: Sat, 22 Feb 2014 16:08:37 +0000 (-0800)
Subject: osd: fix off-by-one is boot subscription
X-Git-Tag: v0.78~135^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1298%2Fhead;p=ceph.git

osd: fix off-by-one is boot subscription

If we have osdmap N, we want to onetime subscribe
starting at N+1.  Among other things, it means we
hear when the NOUP flag is cleared.

This appears to have broken somewhere around
3c76b81f2f96b790b72f2088164ed8e9d5efbba1.

Fixes: #7511
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index cb132ba77ff0..74be48618678 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3576,7 +3576,7 @@ void OSD::_maybe_boot(epoch_t oldest, epoch_t newest)
   
   // get all the latest maps
   if (osdmap->get_epoch() > oldest)
-    osdmap_subscribe(osdmap->get_epoch(), true);
+    osdmap_subscribe(osdmap->get_epoch() + 1, true);
   else
     osdmap_subscribe(oldest - 1, true);
 }