From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 5 Sep 2018 21:37:01 +0000 (-0700)
Subject: Merge pull request #23873 from smithfarm/wip-35068-mimic
X-Git-Tag: v13.2.2~48
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa6c47fa7c1543049299161389c01f9849bcd851;p=ceph.git

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>
---

fa6c47fa7c1543049299161389c01f9849bcd851
diff --cc src/os/bluestore/BlueStore.cc
index 1d5ea00d36834,c3db18b166cb6..0c4fbc0bf9ea4
--- a/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();