From: Liu-Chunmei Date: Tue, 17 Aug 2021 00:15:22 +0000 (-0700) Subject: Merge pull request #42731 from liu-chunmei/seastore-alloc-extent-hint X-Git-Tag: v17.1.0~1106 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a4558a2d26445083284efb38238286e851f847a6;p=ceph.git Merge pull request #42731 from liu-chunmei/seastore-alloc-extent-hint crimson/seastore alloc extent hint Replace L_ADDR_MIN by obj hash in onode, omap, object_data when alloc_extent. Reviewed-by: Sam Just and Cheng, Yingxin --- a4558a2d26445083284efb38238286e851f847a6 diff --cc src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h index 0aabf4ae1433,3ff51d0542e3..ccfd1721b929 --- a/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h +++ b/src/crimson/os/seastore/onode_manager/staged-fltree/node_extent_manager/seastore.h @@@ -128,11 -127,10 +128,11 @@@ class SeastoreNodeExtentManager final: if (trigger_eagain()) { DEBUGT("allocating {}B: trigger eagain", t, len); t.test_set_conflict(); - return alloc_iertr::make_ready_future(); + // FIXME: interruptive-future failed to check invalidation + // return alloc_iertr::make_ready_future(); } } - return tm.alloc_extent(t, addr_min, len + return tm.alloc_extent(t, hint, len ).si_then([len, &t](auto extent) { DEBUGT("allocated {}B at {:#x} -- {}", t, extent->get_length(), extent->get_laddr(), *extent);