From ea4488344aaef810b43f6a4bd54cf9cf475a4451 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 1 Oct 2022 18:03:30 +0800 Subject: [PATCH] crimson/osd: drop redundant code this change is a cleanup. we already update `superblock` with the latest `boost_epoch` and osdmap's epoch in `OSD::handle_osd_map()`, and `committed_osd_maps()` is called at end of this function. `shutdown()` is called when we marked down and stop by the monitor in `committed_osd_maps()`. so these assignment statements are noops. instead, we should stop the whole osd service. let's leave it for another commit. Signed-off-by: Kefu Chai --- src/crimson/osd/osd.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/crimson/osd/osd.cc b/src/crimson/osd/osd.cc index d52ef08717c1e..9af4699dbf47d 100644 --- a/src/crimson/osd/osd.cc +++ b/src/crimson/osd/osd.cc @@ -1179,8 +1179,6 @@ seastar::future<> OSD::restart() seastar::future<> OSD::shutdown() { // TODO - superblock.mounted = boot_epoch; - superblock.clean_thru = osdmap->get_epoch(); return seastar::now(); } -- 2.39.5