]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd: split ClientRequest::PGPipeline into CommonPGPipeline.
authorRadoslaw Zarzynski <rzarzyns@redhat.com>
Thu, 18 Mar 2021 09:41:55 +0000 (09:41 +0000)
committerRadoslaw Zarzynski <rzarzyns@redhat.com>
Mon, 10 May 2021 16:01:32 +0000 (18:01 +0200)
This is another step towards the `InternalClientRequst`.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
src/crimson/osd/osd_operations/client_request.h
src/crimson/osd/osd_operations/common/pg_pipeline.h [new file with mode: 0644]

index f361838bb3fa71102613a7e692c8a46f25dbd238..42bd36f86e6bb487e5d82633bf51267fe9232070 100644 (file)
@@ -7,6 +7,7 @@
 #include "crimson/net/Connection.h"
 #include "crimson/osd/object_context.h"
 #include "crimson/osd/osd_operation.h"
+#include "crimson/osd/osd_operations/common/pg_pipeline.h"
 #include "crimson/common/type_helpers.h"
 #include "messages/MOSDOp.h"
 
@@ -31,22 +32,10 @@ public:
     };
     friend class ClientRequest;
   };
-  class PGPipeline {
+  class PGPipeline : public CommonPGPipeline {
     OrderedExclusivePhase await_map = {
       "ClientRequest::PGPipeline::await_map"
     };
-    OrderedExclusivePhase wait_for_active = {
-      "ClientRequest::PGPipeline::wait_for_active"
-    };
-    OrderedExclusivePhase recover_missing = {
-      "ClientRequest::PGPipeline::recover_missing"
-    };
-    OrderedExclusivePhase get_obc = {
-      "ClientRequest::PGPipeline::get_obc"
-    };
-    OrderedExclusivePhase process = {
-      "ClientRequest::PGPipeline::process"
-    };
     friend class ClientRequest;
   };
 
diff --git a/src/crimson/osd/osd_operations/common/pg_pipeline.h b/src/crimson/osd/osd_operations/common/pg_pipeline.h
new file mode 100644 (file)
index 0000000..59c1058
--- /dev/null
@@ -0,0 +1,27 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
+// vim: ts=8 sw=2 smarttab
+
+#pragma once
+
+#include "osd/osd_op_util.h"
+#include "crimson/osd/osd_operation.h"
+
+namespace crimson::osd {
+
+class CommonPGPipeline {
+protected:
+  OrderedExclusivePhase wait_for_active = {
+    "CommonPGPipeline:::wait_for_active"
+  };
+  OrderedExclusivePhase recover_missing = {
+    "CommonPGPipeline::recover_missing"
+  };
+  OrderedExclusivePhase get_obc = {
+    "CommonPGPipeline::get_obc"
+  };
+  OrderedExclusivePhase process = {
+    "CommonPGPipeline::process"
+  };
+};
+
+} // namespace crimson::osd