crimson/osd/object_context: cleanup is_loaded_and_valid

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit ccc0001a5dc54aef5b4d4b3f85952f1edaf17fb1)

diff --git a/src/crimson/osd/object_context.h b/src/crimson/osd/object_context.h
index b223693385198dd9fd6618c3690210d6bb570b47..d651dc912fd52f8134fec62593f8c4b69f551e05 100644 (file)
--- 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 acf59637e2af9d03a196c8c1e54d7e076ac477d4..d8035b440ea1f0f7d5c96c841a28d6551afa0329 100644 (file)
--- 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<ObjectContextRef>(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());