From 2676e395ac47e5fec89203b1659e50d040157da4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rados=C5=82aw=20Zarzy=C5=84ski?= Date: Tue, 5 Apr 2022 23:10:17 +0200 Subject: [PATCH] crimson/osd: switch all OSD operations to TrackableOperationT MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Radosław Zarzyński --- src/crimson/osd/osd_operations/background_recovery.h | 2 +- src/crimson/osd/osd_operations/client_request.h | 2 +- src/crimson/osd/osd_operations/compound_peering_request.h | 2 +- src/crimson/osd/osd_operations/internal_client_request.h | 2 +- src/crimson/osd/osd_operations/peering_event.h | 2 +- src/crimson/osd/osd_operations/pg_advance_map.h | 2 +- src/crimson/osd/osd_operations/recovery_subrequest.h | 2 +- src/crimson/osd/osd_operations/replicated_request.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/crimson/osd/osd_operations/background_recovery.h b/src/crimson/osd/osd_operations/background_recovery.h index c24f60c440421..98b357dc0c1b3 100644 --- a/src/crimson/osd/osd_operations/background_recovery.h +++ b/src/crimson/osd/osd_operations/background_recovery.h @@ -15,7 +15,7 @@ namespace crimson::osd { class PG; class ShardServices; -class BackgroundRecovery : public OperationT { +class BackgroundRecovery : public TrackableOperationT { public: static constexpr OperationTypeCode type = OperationTypeCode::background_recovery; diff --git a/src/crimson/osd/osd_operations/client_request.h b/src/crimson/osd/osd_operations/client_request.h index b8d16adcfc7fa..aee364a3a66eb 100644 --- a/src/crimson/osd/osd_operations/client_request.h +++ b/src/crimson/osd/osd_operations/client_request.h @@ -16,7 +16,7 @@ namespace crimson::osd { class PG; class OSD; -class ClientRequest final : public OperationT, +class ClientRequest final : public TrackableOperationT, private CommonClientRequest { OSD &osd; crimson::net::ConnectionRef conn; diff --git a/src/crimson/osd/osd_operations/compound_peering_request.h b/src/crimson/osd/osd_operations/compound_peering_request.h index 495306d75d365..9f93b6d64cbda 100644 --- a/src/crimson/osd/osd_operations/compound_peering_request.h +++ b/src/crimson/osd/osd_operations/compound_peering_request.h @@ -18,7 +18,7 @@ class PG; using osd_id_t = int; -class CompoundPeeringRequest : public OperationT { +class CompoundPeeringRequest : public TrackableOperationT { public: static constexpr OperationTypeCode type = OperationTypeCode::compound_peering_request; diff --git a/src/crimson/osd/osd_operations/internal_client_request.h b/src/crimson/osd/osd_operations/internal_client_request.h index b468b3d15cf1f..b9ff5969ef54a 100644 --- a/src/crimson/osd/osd_operations/internal_client_request.h +++ b/src/crimson/osd/osd_operations/internal_client_request.h @@ -10,7 +10,7 @@ namespace crimson::osd { -class InternalClientRequest : public OperationT, +class InternalClientRequest : public TrackableOperationT, private CommonClientRequest { public: explicit InternalClientRequest(Ref pg); diff --git a/src/crimson/osd/osd_operations/peering_event.h b/src/crimson/osd/osd_operations/peering_event.h index d9b9d2db53a1e..fd8d2d751b04a 100644 --- a/src/crimson/osd/osd_operations/peering_event.h +++ b/src/crimson/osd/osd_operations/peering_event.h @@ -21,7 +21,7 @@ class OSD; class ShardServices; class PG; -class PeeringEvent : public OperationT { +class PeeringEvent : public TrackableOperationT { public: static constexpr OperationTypeCode type = OperationTypeCode::peering_event; diff --git a/src/crimson/osd/osd_operations/pg_advance_map.h b/src/crimson/osd/osd_operations/pg_advance_map.h index f19c8631ede90..793074a1a9779 100644 --- a/src/crimson/osd/osd_operations/pg_advance_map.h +++ b/src/crimson/osd/osd_operations/pg_advance_map.h @@ -20,7 +20,7 @@ namespace crimson::osd { class OSD; class PG; -class PGAdvanceMap : public OperationT { +class PGAdvanceMap : public TrackableOperationT { public: static constexpr OperationTypeCode type = OperationTypeCode::pg_advance_map; diff --git a/src/crimson/osd/osd_operations/recovery_subrequest.h b/src/crimson/osd/osd_operations/recovery_subrequest.h index 3127f10bde13a..3d496ab5024fc 100644 --- a/src/crimson/osd/osd_operations/recovery_subrequest.h +++ b/src/crimson/osd/osd_operations/recovery_subrequest.h @@ -15,7 +15,7 @@ namespace crimson::osd { class OSD; class PG; -class RecoverySubRequest final : public OperationT { +class RecoverySubRequest final : public TrackableOperationT { public: static constexpr OperationTypeCode type = OperationTypeCode::background_recovery_sub; diff --git a/src/crimson/osd/osd_operations/replicated_request.h b/src/crimson/osd/osd_operations/replicated_request.h index 17e9e53794476..2077439b89d1d 100644 --- a/src/crimson/osd/osd_operations/replicated_request.h +++ b/src/crimson/osd/osd_operations/replicated_request.h @@ -18,7 +18,7 @@ namespace crimson::osd { class OSD; class PG; -class RepRequest final : public OperationT { +class RepRequest final : public TrackableOperationT { public: class ConnectionPipeline { OrderedExclusivePhase await_map = { -- 2.39.5