osd/PG: remove waiting_for_ack

No longer used.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 7e60d7dea42a4ca30441e9323ac67440ee58002b..b63d1d789f58151681e3278bb3fa16c0eeea7132 100644 (file)
--- 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 0e377deeb2a7bb30856900e39dd59c6aa3fde321..607fadad7039016b3c0722ec521ea142190c6668 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -854,7 +854,7 @@ protected:
   map<hobject_t, list<Context*>, hobject_t::BitwiseComparator> callbacks_for_degraded_object;
 
   map<eversion_t,
-      list<pair<OpRequestRef, version_t> > > waiting_for_ack, waiting_for_ondisk;
+      list<pair<OpRequestRef, version_t> > > waiting_for_ondisk;
 
   void split_ops(PG *child, unsigned split_bits);
 

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 87f6cb5a51c9a85c115327ab04bee898a0087d89..7e2405b11e921baa3bf7b6988442c2431a28426e 100644 (file)
--- 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()