From: Kefu Chai <kchai@redhat.com>
Date: Fri, 12 Jul 2019 06:48:37 +0000 (+0800)
Subject: crimson/osd: an MOSDOp should be waiting for min_epoch
X-Git-Tag: v15.1.0~2186^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a373238878f885ee55e03d420be4f9c8ab76856c;p=ceph-ci.git

crimson/osd: an MOSDOp should be waiting for min_epoch

for MOSDOp, get_min_epoch() is an alias of get_map_epoch(), but
get_min_epoch() is symantically more correct.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/osd/osd_operations/client_request.cc b/src/crimson/osd/osd_operations/client_request.cc
index 8bd81e9816a..06f5669ddcd 100644
--- a/src/crimson/osd/osd_operations/client_request.cc
+++ b/src/crimson/osd/osd_operations/client_request.cc
@@ -50,7 +50,7 @@ seastar::future<> ClientRequest::start()
   IRef ref = this;
   return with_blocking_future(handle.enter(cp().await_map))
     .then([this]() {
-      return with_blocking_future(osd.osdmap_gate.wait_for_map(m->get_map_epoch()));
+      return with_blocking_future(osd.osdmap_gate.wait_for_map(m->get_min_epoch()));
     }).then([this](epoch_t epoch) {
       return with_blocking_future(handle.enter(cp().get_pg));
     }).then([this] {