From 9ea02239929b62c0736c0476b3d5e577e9d9a54d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 31 Oct 2011 15:03:29 -0700 Subject: [PATCH] osd: kill unused on_osd_failure() hook Signed-off-by: Sage Weil --- src/osd/PG.cc | 7 ------- src/osd/PG.h | 1 - src/osd/ReplicatedPG.cc | 5 ----- src/osd/ReplicatedPG.h | 2 -- 4 files changed, 15 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index d353044a38222..7621f7ca063c2 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3550,13 +3550,6 @@ void PG::start_peering_interval(const OSDMap *lastmap, // pg->on_* - /* TODO on_osd_failure does NOTHING! */ -#if 0 - for (unsigned i=0; iis_down(oldacting[i])) - ->on_osd_failure(oldacting[i]); -#endif - on_change(); if (deleting) { diff --git a/src/osd/PG.h b/src/osd/PG.h index 38b230b6f244d..a2ef11d72f3fb 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -1691,7 +1691,6 @@ public: virtual bool same_for_modify_since(epoch_t e) = 0; virtual bool same_for_rep_modify_since(epoch_t e) = 0; - virtual void on_osd_failure(int osd) = 0; virtual void on_role_change() = 0; virtual void on_change() = 0; virtual void on_activate() = 0; diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index c083515a593cc..f11e42840b157 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -4687,11 +4687,6 @@ void ReplicatedPG::_finish_mark_all_unfound_lost(list& obcs) * pg status change notification */ -void ReplicatedPG::on_osd_failure(int o) -{ - //dout(10) << "on_osd_failure " << o << dendl; -} - void ReplicatedPG::apply_and_flush_repops(bool requeue) { list rq; diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h index 7173a400fe51a..5cb5f98798f72 100644 --- a/src/osd/ReplicatedPG.h +++ b/src/osd/ReplicatedPG.h @@ -820,8 +820,6 @@ public: utime_t mtime, int what); void _finish_mark_all_unfound_lost(list& obcs); - void on_osd_failure(int o); - void on_acker_change(); void on_role_change(); void on_change(); void on_activate(); -- 2.39.5