From b623594c44df1c7d75fa7a8d4e8b90f8829d249f Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Mon, 18 Mar 2024 23:26:36 +0000 Subject: [PATCH] crimson/osd/osd.h: declare osdmap after OSDSingletonState Otherwise, destructing the osdmap cached_map_t tries to manipulate OSDSingletonState::osdmaps after it has already been destroyed. Fixes: https://tracker.ceph.com/issues/64935 Signed-off-by: Samuel Just --- src/crimson/osd/osd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/crimson/osd/osd.h b/src/crimson/osd/osd.h index db30ad0ec73..fa3b0293072 100644 --- a/src/crimson/osd/osd.h +++ b/src/crimson/osd/osd.h @@ -80,7 +80,6 @@ class OSD final : public crimson::net::Dispatcher, std::unique_ptr mgrc; // TODO: use a wrapper for ObjectStore - OSDMapService::cached_map_t osdmap; crimson::os::FuturizedStore& store; /// _first_ epoch we were marked up (after this process started) @@ -122,6 +121,8 @@ class OSD final : public crimson::net::Dispatcher, seastar::sharded osd_states; seastar::sharded shard_services; + OSDMapService::cached_map_t osdmap; + crimson::osd::PGShardManager pg_shard_manager; std::unique_ptr heartbeat; -- 2.39.5