From: Igor Fedotov <igor.fedotov@croit.io>
Date: Wed, 1 Nov 2023 09:38:06 +0000 (+0300)
Subject: Merge pull request #47730 from ifed01/wip-ifed-alloc-logging
X-Git-Tag: v19.0.0~207
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=542d7fb8c1d76a0a50b6be5fe7a336daa31ece89;p=ceph.git

Merge pull request #47730 from ifed01/wip-ifed-alloc-logging

os/bluestore: assert on improper release in AvlAllocator

Reviewed-by: Pere Diaz Bou <pere-altea@hotmail.com>
---

542d7fb8c1d76a0a50b6be5fe7a336daa31ece89
diff --cc src/os/bluestore/AvlAllocator.cc
index 26eba36a0ec20,317291e65f491..1a170d13fdb98
--- a/src/os/bluestore/AvlAllocator.cc
+++ b/src/os/bluestore/AvlAllocator.cc
@@@ -445,27 -475,27 +475,27 @@@ void AvlAllocator::_foreach
  
  void AvlAllocator::init_add_free(uint64_t offset, uint64_t length)
  {
 -  if (!length)
 -    return;
 -  std::lock_guard l(lock);
 -  ceph_assert(offset + length <= uint64_t(device_size));
    ldout(cct, 10) << __func__ << std::hex
-                  << " offset 0x" << offset
-                  << " length 0x" << length
+                  << " 0x" << offset
+                  << "~" << length
                   << std::dec << dendl;
 +  if (!length)
 +    return;
 +  std::lock_guard l(lock);
 +  ceph_assert(offset + length <= uint64_t(device_size));
    _add_to_tree(offset, length);
  }
  
  void AvlAllocator::init_rm_free(uint64_t offset, uint64_t length)
  {
 -  if (!length)
 -    return;
 -  std::lock_guard l(lock);
 -  ceph_assert(offset + length <= uint64_t(device_size));
    ldout(cct, 10) << __func__ << std::hex
-                  << " offset 0x" << offset
-                  << " length 0x" << length
+                  << " 0x" << offset
+                  << "~" << length
                   << std::dec << dendl;
 +  if (!length)
 +    return;
 +  std::lock_guard l(lock);
 +  ceph_assert(offset + length <= uint64_t(device_size));
    _remove_from_tree(offset, length);
  }