From 70d23b9a0ad9af5ca35a627a7f93c7e610e17549 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 22 Feb 2014 08:08:37 -0800 Subject: [PATCH] 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 --- src/osd/OSD.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } -- 2.47.3