Merge pull request #17060 from cyx1231st/fix_reqid_assignment_in_opre…

…quest

osd: fix reqid assignment for reply messages in OpRequest

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>

src/osd/OpRequest.cc

@@ -9,7 +9,9 @@
 #include "msg/Message.h"
 #include "messages/MOSDOp.h"
 #include "messages/MOSDSubOp.h"
+#include "messages/MOSDSubOpReply.h"
 #include "messages/MOSDRepOp.h"
+#include "messages/MOSDRepOpReply.h"
 #include "include/assert.h"
 #include "osd/osd_types.h"
 
@@ -36,8 +38,12 @@ OpRequest::OpRequest(Message *req, OpTracker *tracker) :
     reqid = static_cast<MOSDOp*>(req)->get_reqid();
   } else if (req->get_type() == MSG_OSD_SUBOP) {
     reqid = static_cast<MOSDSubOp*>(req)->reqid;
+  } else if (req->get_type() == MSG_OSD_SUBOPREPLY) {
+    reqid = static_cast<MOSDSubOpReply*>(req)->reqid;
   } else if (req->get_type() == MSG_OSD_REPOP) {
     reqid = static_cast<MOSDRepOp*>(req)->reqid;
+  } else if (req->get_type() == MSG_OSD_REPOPREPLY) {
+    reqid = static_cast<MOSDRepOpReply*>(req)->reqid;
   }
   req_src_inst = req->get_source_inst();
   mark_event("header_read", request->get_recv_stamp());