]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: enforce one more non-inclusive comparision against prefer_deferred_size
authorIgor Fedotov <ifedotov@suse.com>
Mon, 9 Aug 2021 16:14:33 +0000 (19:14 +0300)
committerIgor Fedotov <ifedotov@suse.com>
Tue, 10 Aug 2021 11:34:17 +0000 (14:34 +0300)
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
src/os/bluestore/BlueStore.cc

index 6d6f7210156441318b3ebc294a4c8f892b82bf60..a1325fa54813f9c75c1497a47b7b24d32f0ee77b 100644 (file)
@@ -14263,10 +14263,11 @@ int BlueStore::_do_alloc_write(
 
     PExtentVector extents;
     int64_t left = final_length;
-    bool deferred_region_small = false;
+    bool has_chunk2defer = false;
+    auto prefer_deferred_size_snapshot = prefer_deferred_size.load();
     while (left > 0) {
       ceph_assert(prealloc_left > 0);
-      deferred_region_small |= (prealloc_pos_length <= prefer_deferred_size.load());
+      has_chunk2defer |= (prealloc_pos_length < prefer_deferred_size_snapshot);
       if (prealloc_pos->length <= left) {
        prealloc_left -= prealloc_pos->length;
        left -= prealloc_pos->length;
@@ -14321,7 +14322,7 @@ int BlueStore::_do_alloc_write(
 
     // queue io
     if (!g_conf()->bluestore_debug_omit_block_device_write) {
-      if (deferred_region_small && l->length() < prefer_deferred_size.load()) {
+      if (has_chunk2defer && l->length() < prefer_deferred_size_snapshot) {
        dout(20) << __func__ << " deferring 0x" << std::hex
                 << l->length() << std::dec << " write via deferred" << dendl;
        bluestore_deferred_op_t *op = _get_deferred_op(txc, l->length());