diff options
author | Samuel Just <sjust@redhat.com> | 2023-01-25 06:51:34 +0100 |
---|---|---|
committer | Samuel Just <sjust@redhat.com> | 2023-01-28 02:20:47 +0100 |
commit | 110ecaf0607f3f3d33b47588177c31ba33d60051 (patch) | |
tree | 55fb136a23b661ffc81a0915cbcc513d1035f3fe /src/crimson/osd/pg_backend.h | |
parent | crimson/osd/pg_interval_interrupt_condition: use new logging macros (diff) | |
download | ceph-110ecaf0607f3f3d33b47588177c31ba33d60051.tar.xz ceph-110ecaf0607f3f3d33b47588177c31ba33d60051.zip |
crimson/osd/pg_backend: remove stopping and peering
These two state variables duplicate checks that *should* already
be handled by the IOInterruptCondition. None of the stopping
checks should ever trigger because the caller would be in an
interruptible future context which already performed that check.
Moreover, peering doesn't really work -- it relies on the callback
firing prior the call to on_activate_complete(), and there isn't any
guarantee that will happen. Storing the epoch from when the
callback was created as we do in IOInterruptCondition
would be required.
Signed-off-by: Samuel Just <sjust@redhat.com>
Diffstat (limited to 'src/crimson/osd/pg_backend.h')
-rw-r--r-- | src/crimson/osd/pg_backend.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/crimson/osd/pg_backend.h b/src/crimson/osd/pg_backend.h index b833c8403f2..aa581134420 100644 --- a/src/crimson/osd/pg_backend.h +++ b/src/crimson/osd/pg_backend.h @@ -383,19 +383,13 @@ public: virtual void got_rep_op_reply(const MOSDRepOpReply&) {} virtual seastar::future<> stop() = 0; - struct peering_info_t { - bool is_primary; - }; - virtual void on_actingset_changed(peering_info_t pi) = 0; - virtual void on_activate_complete(); + virtual void on_actingset_changed(bool same_primary) = 0; protected: const shard_id_t shard; CollectionRef coll; crimson::osd::ShardServices &shard_services; DoutPrefixProvider &dpp; ///< provides log prefix context crimson::os::FuturizedStore* store; - bool stopping = false; - std::optional<peering_info_t> peering; virtual seastar::future<> request_committed( const osd_reqid_t& reqid, const eversion_t& at_version) = 0; |