Merge pull request #23873 from smithfarm/wip-35068-mimic

mimic: core: deep scrub cannot find the bitrot if the object is cached

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --cc src/os/bluestore/BitmapFreelistManager.cc
Simple merge

diff --cc src/os/bluestore/BlueStore.cc
index 1d5ea00d368341edc3219074556133f39f83b312,c3db18b166cb6827ba7b3f36e5468313ec5f5cf1..0c4fbc0bf9ea4c74f2a6d9e3e9f9a1881dcfd8d5
--- 1/src/os/bluestore/BlueStore.cc
--- 2/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@@ -8684,10 -8685,10 +8700,10 @@@ void BlueStore::_txc_committed_kv(Trans
  void BlueStore::_txc_finish(TransContext *txc)
  {
    dout(20) << __func__ << " " << txc << " onodes " << txc->onodes << dendl;
-   assert(txc->state == TransContext::STATE_FINISHING);
+   ceph_assert(txc->state == TransContext::STATE_FINISHING);
  
    for (auto& sb : txc->shared_blobs_written) {
 -    sb->bc.finish_write(sb->get_cache(), txc->seq);
 +    sb->finish_write(txc->seq);
    }
    txc->shared_blobs_written.clear();
  

diff --cc src/os/bluestore/BlueStore.h
Simple merge

diff --cc src/osd/ReplicatedBackend.cc
Simple merge