From e3c64648c691ed1cefe13b7159a7d93a2866ba26 Mon Sep 17 00:00:00 2001 From: Radoslaw Zarzynski Date: Thu, 18 Mar 2021 09:41:55 +0000 Subject: [PATCH] crimson/osd: split ClientRequest::PGPipeline into CommonPGPipeline. This is another step towards the `InternalClientRequst`. Signed-off-by: Radoslaw Zarzynski --- .../osd/osd_operations/client_request.h | 15 ++--------- .../osd/osd_operations/common/pg_pipeline.h | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 13 deletions(-) create mode 100644 src/crimson/osd/osd_operations/common/pg_pipeline.h diff --git a/src/crimson/osd/osd_operations/client_request.h b/src/crimson/osd/osd_operations/client_request.h index f361838bb3fa7..42bd36f86e6bb 100644 --- a/src/crimson/osd/osd_operations/client_request.h +++ b/src/crimson/osd/osd_operations/client_request.h @@ -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 index 0000000000000..59c105842c898 --- /dev/null +++ b/src/crimson/osd/osd_operations/common/pg_pipeline.h @@ -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 -- 2.39.5