]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
crimson/osd: an MOSDOp should be waiting for min_epoch
authorKefu Chai <kchai@redhat.com>
Fri, 12 Jul 2019 06:48:37 +0000 (14:48 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 13 Jul 2019 13:46:05 +0000 (21:46 +0800)
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>
src/crimson/osd/osd_operations/client_request.cc

index 8bd81e9816a33bd9b546c6b5f371c6539248d6b7..06f5669ddcdf2671a616617d69f4f2044f856a22 100644 (file)
@@ -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] {