From 7436b4c99034dd19b2ff1e759603779061cbfdb6 Mon Sep 17 00:00:00 2001 From: Joshua Baergen Date: Wed, 29 Nov 2023 08:47:01 -0700 Subject: [PATCH] test/librbd: Add workaround for a journaling deadlock that this test exposes Signed-off-by: Joshua Baergen --- src/test/librbd/journal/test_Stress.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/librbd/journal/test_Stress.cc b/src/test/librbd/journal/test_Stress.cc index 752ecf01f05ee..d2b9353fb5f8d 100644 --- a/src/test/librbd/journal/test_Stress.cc +++ b/src/test/librbd/journal/test_Stress.cc @@ -46,6 +46,10 @@ TEST_F(TestJournalStress, DiscardWithPruneWriteOverlap) { // Write-around cache required for overlapping I/O delays. cct->_conf.set_val_or_die("rbd_cache_writethrough_until_flush", "false"); cct->_conf.set_val_or_die("rbd_cache_policy", "writearound"); + // XXX: Work around https://tracker.ceph.com/issues/63681, which this test + // exposes when run under Valgrind. + cct->_conf.set_val_or_die("librados_thread_count", "15"); + cct->_conf.apply_changes(nullptr); auto image_name = get_temp_image_name(); ASSERT_EQ(0, create_image_pp(m_rbd, m_ioctx, image_name, image_size)); -- 2.39.5