From: Radoslaw Zarzynski Date: Mon, 25 Mar 2024 14:31:55 +0000 (+0000) Subject: crimson/osd: settle ECCommon::RecoveryBackend within crimson-osd X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=846e09e070d48eb46cdbd45520002e876fc4b526;p=ceph-ci.git crimson/osd: settle ECCommon::RecoveryBackend within crimson-osd Signed-off-by: Radoslaw Zarzynski --- diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h index 2991cc7e837..d73aca03305 100644 --- a/src/crimson/osd/pg.h +++ b/src/crimson/osd/pg.h @@ -178,6 +178,12 @@ public: DoutPrefixProvider *get_dpp() override { return this; } + void add_temp_obj(const hobject_t &oid) override { + get_backend().add_temp_obj(oid); + } + void clear_temp_obj(const hobject_t &oid) override { + get_backend().clear_temp_obj(oid); + } // ECListener ends const pg_shard_t& get_pg_whoami() const final { diff --git a/src/osd/ECListener.h b/src/osd/ECListener.h index 765c1411015..b25c8c1c5c1 100644 --- a/src/osd/ECListener.h +++ b/src/osd/ECListener.h @@ -105,10 +105,11 @@ struct ECListener { virtual void pg_add_num_bytes(int64_t num_bytes) = 0; //virtual void pg_sub_num_bytes(int64_t num_bytes) = 0; virtual void inc_osd_stat_repaired() = 0; - +#endif virtual void add_temp_obj(const hobject_t &oid) = 0; virtual void clear_temp_obj(const hobject_t &oid) = 0; - virtual epoch_t get_last_peering_reset_epoch() const = 0; +#ifndef WITH_CRIMSON + virtual epoch_t get_last_peering_reset_epoch() const = 0; #endif // XXX