From: Yingxin <yingxin.cheng@intel.com>
Date: Thu, 17 Aug 2017 14:41:40 +0000 (-0400)
Subject: osd/OpRequest: fix reqid assignment for reply messages
X-Git-Tag: v13.0.0~64^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4186d9efa4c9b39cd74d360d0740c88200a11446;p=ceph.git

osd/OpRequest: fix reqid assignment for reply messages

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
---

diff --git a/src/osd/OpRequest.cc b/src/osd/OpRequest.cc
index 4a85a2c5610b5..b6e20949624dc 100644
--- a/src/osd/OpRequest.cc
+++ b/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());