From 0cb51ab40be93ea2dffd13ae5c0f21eacea6809c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 20 Dec 2016 15:55:56 -0500 Subject: [PATCH] osd/PG: remove waiting_for_ack No longer used. Signed-off-by: Sage Weil --- src/osd/PG.cc | 1 - src/osd/PG.h | 2 +- src/osd/PrimaryLogPG.cc | 7 ------- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 7e60d7dea42..b63d1d789f5 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -2212,7 +2212,6 @@ void PG::split_ops(PG *child, unsigned split_bits) { assert(waiting_for_cache_not_full.empty()); assert(waiting_for_unreadable_object.empty()); assert(waiting_for_degraded_object.empty()); - assert(waiting_for_ack.empty()); assert(waiting_for_ondisk.empty()); assert(waiting_for_active.empty()); diff --git a/src/osd/PG.h b/src/osd/PG.h index 0e377deeb2a..607fadad703 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -854,7 +854,7 @@ protected: map, hobject_t::BitwiseComparator> callbacks_for_degraded_object; map > > waiting_for_ack, waiting_for_ondisk; + list > > waiting_for_ondisk; void split_ops(PG *child, unsigned split_bits); diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 87f6cb5a51c..7e2405b11e9 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -8492,12 +8492,6 @@ void PrimaryLogPG::eval_repop(RepGather *repop) } waiting_for_ondisk.erase(repop->v); } - - // clear out acks, we sent the commits above - if (waiting_for_ack.count(repop->v)) { - assert(waiting_for_ack.begin()->first == repop->v); - waiting_for_ack.erase(repop->v); - } } // applied? @@ -10033,7 +10027,6 @@ void PrimaryLogPG::apply_and_flush_repops(bool requeue) } waiting_for_ondisk.clear(); - waiting_for_ack.clear(); } void PrimaryLogPG::on_flushed() -- 2.39.5