osd: don't reply on missing class

Instead, we queue ourselves in the waiting_for_class list.  Broken by
f1eb9a8751d48.

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4924560995e256e3eff63fe8c771143638f9401f..6bf1bdb76584f1d7e9af4290041db93878ea6804 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -4837,7 +4837,7 @@ void OSD::handle_class(MClass *m)
     return;
 
   Mutex::Locker l(class_lock);
-  dout(0) << "handle_class action=" << m->action << dendl;
+  dout(10) << "handle_class action=" << m->action << dendl;
 
   switch (m->action) {
   case CLASS_RESPONSE:

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 2b3cc73b8d019f065d417987d01ef5be5aef24ab..5c3e51b6a87c7f6f7204cf45045901c668eeab66 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -361,10 +361,8 @@ void ReplicatedPG::do_op(MOSDOp *op)
       obc->ondisk_read_unlock();
     }
 
-    if (result == -EAGAIN) { //must have referenced non-existent class
-      osd->reply_op_error(op, r);
+    if (result == -EAGAIN) // must have referenced non-existent class
       return;
-    }
 
     // prepare the reply
     ctx->reply = new MOSDOpReply(op, 0, osd->osdmap->get_epoch(), 0);