crimson/osd: add can_discard_op method for detecting "discardable" client requests

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc
index a6e6d1e682a7ac6171de0094623941668aa69aeb..a51cc7256d640fc780e665c4be664a49d977c2bf 100644 (file)
--- a/src/crimson/osd/osd_operations/client_request.cc
+++ b/src/crimson/osd/osd_operations/client_request.cc
@@ -69,9 +69,7 @@ seastar::future<> ClientRequest::start()
        return with_blocking_future(osd.wait_for_pg(m->get_spg()));
       }).then([this, opref](Ref<PG> pgref) {
        PG &pg = *pgref;
-       if (__builtin_expect(m->get_map_epoch()
-                             < pg.get_info().history.same_primary_since,
-                            false)) {
+       if (pg.can_discard_op(*m)) {
          return osd.send_incremental_map(conn.get(), m->get_map_epoch());
        }
        return with_blocking_future(

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index ca99a4b99966adb5ab396752d029e2f71ad29bba..3abe129c2fe410a5ea50c49703974986a54344ad 100644 (file)
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -993,4 +993,9 @@ void PG::on_change(ceph::os::Transaction &t) {
   backend->on_actingset_changed({ is_primary() });
 }
 
+bool PG::can_discard_op(const MOSDOp& m) const {
+  return __builtin_expect(m.get_map_epoch()
+      < peering_state.get_info().history.same_primary_since, false);
+}
+
 }

diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h
index 7bfc477b0a298366b3b68777229ec79c18c653c7..7cdd054c33a3701ca20748b43d59bef199aa1ad6 100644 (file)
--- a/src/crimson/osd/pg.h
+++ b/src/crimson/osd/pg.h
@@ -672,6 +672,7 @@ private:
 
   template <typename MsgType>
   bool can_discard_replica_op(const MsgType& m) const;
+  bool can_discard_op(const MOSDOp& m) const;
   bool is_missing_object(const hobject_t& soid) const {
     return peering_state.get_pg_log().get_missing().get_items().count(soid);
   }