From: Mark Kogan <mkogan@ibm.com>
Date: Tue, 28 Nov 2023 12:34:31 +0000 (+0200)
Subject: rgw: d3n: fix valgrind reported leak related to libaio worker threads
X-Git-Tag: v18.2.4~365^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d768372fccbf75d9ce649fe1f4dfcf0f0ee6c460;p=ceph.git

rgw: d3n: fix valgrind reported leak related to libaio worker threads

which sporadically reproduces on teuthology ubuntu instances

happens because a race between RGW shutdown occurring before
the libaio worker threads had terminated

to fix, reduced the libaio threads inactivity shutdown time

ref:
man aio_init
...
aio_idle_time
This field specifies the amount of time in seconds that a worker thread
should wait for further requests before terminating, after having
completed a previous request.   The
default value is 1.
...

Fixes: https://tracker.ceph.com/issues/63445

Signed-off-by: Mark Kogan <mkogan@ibm.com>
(cherry picked from commit dd258d8da00c400fdca752c47366b6bd453e27ed)
---

diff --git a/src/rgw/driver/rados/rgw_d3n_datacache.cc b/src/rgw/driver/rados/rgw_d3n_datacache.cc
index f1bf731ae443..b744a16a3c7c 100644
--- a/src/rgw/driver/rados/rgw_d3n_datacache.cc
+++ b/src/rgw/driver/rados/rgw_d3n_datacache.cc
@@ -105,7 +105,7 @@ void D3nDataCache::init(CephContext *_cct) {
   struct aioinit ainit{0};
   ainit.aio_threads = cct->_conf.get_val<int64_t>("rgw_d3n_libaio_aio_threads");
   ainit.aio_num = cct->_conf.get_val<int64_t>("rgw_d3n_libaio_aio_num");
-  ainit.aio_idle_time = 10;
+  ainit.aio_idle_time = 5;
   aio_init(&ainit);
 #endif
 }