Skip to content

Commit 201b020

Browse files
committed
crimson/osd: always ask for the newest osdmap
Fixes: https://tracker.ceph.com/issues/73317 Signed-off-by: Xuehan Xu <[email protected]>
1 parent 629e419 commit 201b020

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

src/crimson/osd/osd.cc

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,19 +1286,20 @@ seastar::future<> OSD::committed_osd_maps(
12861286
}
12871287
}
12881288

1289+
if (!pg_shard_manager.is_stopping()) {
1290+
/*
1291+
* TODO: Missing start_waiting_for_healthy() counterpart.
1292+
* Only subscribe to the next map until implemented.
1293+
* See https://tracker.ceph.com/issues/66832
1294+
*/
1295+
co_await get_shard_services().osdmap_subscribe(osdmap->get_epoch() + 1, false);
1296+
}
12891297
if (pg_shard_manager.is_active()) {
12901298
INFO("osd.{}: now active", whoami);
12911299
if (!osdmap->exists(whoami) || osdmap->is_stop(whoami)) {
12921300
co_await shutdown();
12931301
} else if (should_restart()) {
12941302
co_await restart();
1295-
} else if (!pg_shard_manager.is_stopping()) {
1296-
/*
1297-
* TODO: Missing start_waiting_for_healthy() counterpart.
1298-
* Only subscribe to the next map until implemented.
1299-
* See https://tracker.ceph.com/issues/66832
1300-
*/
1301-
co_await get_shard_services().osdmap_subscribe(osdmap->get_epoch() + 1, false);
13021303
}
13031304
} else if (pg_shard_manager.is_preboot()) {
13041305
INFO("osd.{}: now preboot", whoami);

0 commit comments

Comments
 (0)