Merge pull request ceph#63715 from benhanokh/dedup_thread_name_fix

cbodley · web-flow · commit 71f5a7d4a44b · 2025-06-09T12:12:38.000-04:00
rgw/dedup: Bug-Fix

Reviewed-by: Yuval Lifshitz &lt;ylifshit@ibm.com&gt;
diff --git a/src/rgw/rgw_dedup.cc b/src/rgw/rgw_dedup.cc
@@ -2284,8 +2284,6 @@ namespace rgw::dedup {
       d_ctl.started = true;
     }
     d_runner = std::thread(&Background::run, this);
-    const auto rc = ceph_pthread_setname("dedup_bg");
-    ldpp_dout(dpp, 5) << "dedup_bg start() = " << rc << dendl;
   }
 
   //------------------------- --------------------------------------------------
@@ -2467,6 +2465,9 @@ namespace rgw::dedup {
   //---------------------------------------------------------------------------
   void Background::run()
   {
+    const auto rc = ceph_pthread_setname("dedup_bg");
+    ldpp_dout(dpp, 5) << __func__ << "ceph_pthread_setname() ret=" << rc << dendl;
+
     // 256x8KB=2MB
     const uint64_t PER_SHARD_BUFFER_SIZE = DISK_BLOCK_COUNT *sizeof(disk_block_t);
     ldpp_dout(dpp, 20) <<__func__ << "::dedup::main loop" << dendl;

Original file line number	Diff line number	Diff line change
`@@ -2284,8 +2284,6 @@ namespace rgw::dedup {`
`2284`	`2284`	`d_ctl.started = true;`
`2285`	`2285`	`}`
`2286`	`2286`	`d_runner = std::thread(&Background::run, this);`
`2287`		`- const auto rc = ceph_pthread_setname("dedup_bg");`
`2288`		`- ldpp_dout(dpp, 5) << "dedup_bg start() = " << rc << dendl;`
`2289`	`2287`	`}`
`2290`	`2288`
`2291`	`2289`	`//------------------------- --------------------------------------------------`
`@@ -2467,6 +2465,9 @@ namespace rgw::dedup {`
`2467`	`2465`	`//---------------------------------------------------------------------------`
`2468`	`2466`	`void Background::run()`
`2469`	`2467`	`{`
	`2468`	`+ const auto rc = ceph_pthread_setname("dedup_bg");`
	`2469`	`+ ldpp_dout(dpp, 5) << __func__ << "ceph_pthread_setname() ret=" << rc << dendl;`
	`2470`	`+`
`2470`	`2471`	`// 256x8KB=2MB`
`2471`	`2472`	`const uint64_t PER_SHARD_BUFFER_SIZE = DISK_BLOCK_COUNT *sizeof(disk_block_t);`
`2472`	`2473`	`ldpp_dout(dpp, 20) <<__func__ << "::dedup::main loop" << dendl;`