Merge pull request ceph#54402 from athanatos/sjust/wip-fix-tmdriver

athanatos · web-flow · commit db6fbc96537b · 2023-11-07T18:22:36.000-08:00
crimson/tools/store_nbd/tm_driver: use TransactionManager::remove

Reviewed-by: Xuehan Xu &lt;xuxuehan@qianxin.com&gt;
diff --git a/src/crimson/tools/store_nbd/tm_driver.cc b/src/crimson/tools/store_nbd/tm_driver.cc
@@ -27,7 +27,7 @@ seastar::future<> TMDriver::write(
         "write",
         [this, offset, &ptr](auto& t)
       {
-        return tm->dec_ref(t, offset
+        return tm->remove(t, offset
         ).si_then([](auto){}).handle_error_interruptible(
           crimson::ct_error::enoent::handle([](auto) { return seastar::now(); }),
           crimson::ct_error::pass_further_all{}

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ seastar::future<> TMDriver::write(`
`27`	`27`	`"write",`
`28`	`28`	`[this, offset, &ptr](auto& t)`
`29`	`29`	`{`
`30`		`- return tm->dec_ref(t, offset`
	`30`	`+ return tm->remove(t, offset`
`31`	`31`	`).si_then([](auto){}).handle_error_interruptible(`
`32`	`32`	`crimson::ct_error::enoent::handle([](auto) { return seastar::now(); }),`
`33`	`33`	`crimson::ct_error::pass_further_all{}`