From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Tue, 3 Aug 2021 13:24:26 +0000 (+0000)
Subject: crimson/osd: make OpSequencer specific to ClientRequest.
X-Git-Tag: v17.1.0~865^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3830c43f7d478f130b24c43324765f032ce43bbd;p=ceph.git

crimson/osd: make OpSequencer specific to ClientRequest.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/osd_operation_sequencer.h b/src/crimson/osd/osd_operation_sequencer.h
index ee0760a300a..4a80a92307f 100644
--- a/src/crimson/osd/osd_operation_sequencer.h
+++ b/src/crimson/osd/osd_operation_sequencer.h
@@ -6,7 +6,7 @@
 #include <map>
 #include <fmt/format.h>
 #include <seastar/core/condition-variable.hh>
-#include "crimson/common/operation.h"
+#include "crimson/osd/osd_operations/client_request.h"
 
 namespace crimson::osd {
 
@@ -26,12 +26,11 @@ namespace crimson::osd {
 // can keep an op waiting in the case explained above.
 class OpSequencer {
 public:
-  template <typename OpT,
-            typename HandleT,
+  template <typename HandleT,
             typename FuncT,
             typename Result = std::invoke_result_t<FuncT>>
   seastar::futurize_t<Result>
-  start_op(const OpT& op,
+  start_op(const ClientRequest& op,
            HandleT& handle,
            FuncT&& do_op) {
     const uint64_t prev_op = op.get_prev_id();
@@ -72,13 +71,11 @@ public:
   uint64_t get_last_issued() const {
     return last_issued;
   }
-  template <class OpT>
-  void finish_op(const OpT& op) {
+  void finish_op(const ClientRequest& op) {
     assert(op.get_id() > last_completed);
     last_completed = op.get_id();
   }
-  template <class OpT>
-  void maybe_reset(const OpT& op) {
+  void maybe_reset(const ClientRequest& op) {
     const auto op_id = op.get_id();
     // pg interval changes, so we need to reenqueue the previously unblocked
     // ops by rewinding the "last_unblock" pointer