osd: remove bad assertion in op_modify_ondisk

We may not be in waitfor_disk if we are marked failed and
on_osd_failure acked and removed us from the set.

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index f8f866f605a5865f6ce59664d270af96f0992bbb..7555530c8147530efa926025d280f510dd3c556e 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1203,9 +1203,10 @@ void ReplicatedPG::op_modify_ondisk(RepGather *repop)
 {
   if (repop->aborted) {
     dout(10) << "op_modify_ondisk " << *repop << " -- aborted" << dendl;
+  } else if (repop->waitfor_disk.count(osd->get_nodeid()) == 0) {
+    dout(10) << "op_modify_ondisk " << *repop << " -- already marked ondisk" << dendl;
   } else {
     dout(10) << "op_modify_ondisk " << *repop << dendl;
-    assert(repop->waitfor_disk.count(osd->get_nodeid()));
     repop->waitfor_disk.erase(osd->get_nodeid());
     repop->waitfor_nvram.erase(osd->get_nodeid());
     repop->pg_complete_thru[osd->get_nodeid()] = repop->pg_local_last_complete;

diff --git a/src/osd/ReplicatedPG.h b/src/osd/ReplicatedPG.h
index 651f894f91fcaaf8b4146b6012564116e5273935..9faf37f97056c970d545653b8ce746a85c5cfcd0 100644 (file)
--- a/src/osd/ReplicatedPG.h
+++ b/src/osd/ReplicatedPG.h
@@ -220,7 +220,6 @@ inline ostream& operator<<(ostream& out, ReplicatedPG::RepGather& repop)
       << " wfdisk=" << repop.waitfor_disk;
   out << " pct=" << repop.pg_complete_thru;
   out << " op=" << *(repop.op);
-  out << " " << &repop;
   out << ")";
   return out;
 }