From ccc0001a5dc54aef5b4d4b3f85952f1edaf17fb1 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Mon, 27 May 2024 15:24:00 +0000 Subject: [PATCH] crimson/osd/object_context: cleanup is_loaded_and_valid Signed-off-by: Matan Breizman --- src/crimson/osd/object_context.h | 4 ---- src/crimson/osd/object_context_loader.cc | 15 ++++++--------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/src/crimson/osd/object_context.h b/src/crimson/osd/object_context.h index b2236933851..d651dc912fd 100644 --- a/src/crimson/osd/object_context.h +++ b/src/crimson/osd/object_context.h @@ -125,10 +125,6 @@ public: return !invalidated_by_interval_change; } - bool is_loaded_and_valid() const { - return is_loaded() && is_valid(); - } - private: tri_mutex lock; bool recovery_read_marker = false; diff --git a/src/crimson/osd/object_context_loader.cc b/src/crimson/osd/object_context_loader.cc index acf59637e2a..d8035b440ea 100644 --- a/src/crimson/osd/object_context_loader.cc +++ b/src/crimson/osd/object_context_loader.cc @@ -144,18 +144,15 @@ using crimson::common::local_conf; bool existed) { LOG_PREFIX(ObjectContextLoader::get_or_load_obc); + DEBUGDPP("{} -- fully_loaded={}, " + "invalidated_by_interval_change={}", + dpp, obc->get_oid(), + obc->fully_loaded, + obc->invalidated_by_interval_change); auto loaded = load_obc_iertr::make_ready_future(obc); if (existed && obc->is_loaded()) { - if (!obc->is_loaded_and_valid()) { - ERRORDPP( - "obc for {} invalid -- fully_loaded={}, " - "invalidated_by_interval_change={}", - dpp, obc->get_oid(), - obc->fully_loaded, obc->invalidated_by_interval_change - ); - } - ceph_assert(obc->is_loaded_and_valid()); + ceph_assert(obc->is_valid()); DEBUGDPP("cache hit on {}", dpp, obc->get_oid()); } else { DEBUGDPP("cache miss on {}", dpp, obc->get_oid()); -- 2.39.5