Skip to content

Commit 420dcdb

Browse files
authored
Merge pull request ceph#58256 from NitzanMordhai/wip-nitzan-wait-osd-admin-command
crimson/osd: adding osdmap subscribe Reviewed-by: Matan Breizman <[email protected]>
2 parents d8e9aa7 + a9de8be commit 420dcdb

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

qa/suites/crimson-rados/basic/tasks/rados_python.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ tasks:
1717
timeout: 1h
1818
clients:
1919
client.0:
20-
- rados/test_python.sh -m 'not (wait or tier or ec or bench)'
20+
- rados/test_python.sh -m 'not (tier or ec or bench)'

src/crimson/osd/osd.cc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1183,6 +1183,13 @@ seastar::future<> OSD::committed_osd_maps(
11831183
}
11841184
if (should_restart()) {
11851185
return restart();
1186+
} else if (!pg_shard_manager.is_stopping()) {
1187+
/*
1188+
* TODO: Missing start_waiting_for_healthy() counterpart.
1189+
* Only subscribe to the next map until implemented.
1190+
* See https://tracker.ceph.com/issues/66832
1191+
*/
1192+
return get_shard_services().osdmap_subscribe(osdmap->get_epoch() + 1, false);
11861193
} else {
11871194
return seastar::now();
11881195
}

0 commit comments

Comments
 (0)