From: Joshua Baergen <jbaergen@digitalocean.com>
Date: Wed, 29 Nov 2023 15:47:01 +0000 (-0700)
Subject: test/librbd: Add workaround for a journaling deadlock that this test exposes
X-Git-Tag: testing/wip-pdonnell-testing-20240430.123648-reef-debug~354^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=482ace9617184ad72567220616132e544bafdfe5;p=ceph-ci.git

test/librbd: Add workaround for a journaling deadlock that this test exposes

Signed-off-by: Joshua Baergen <jbaergen@digitalocean.com>
(cherry picked from commit 7436b4c99034dd19b2ff1e759603779061cbfdb6)
---

diff --git a/src/test/librbd/journal/test_Stress.cc b/src/test/librbd/journal/test_Stress.cc
index 752ecf01f05..d2b9353fb5f 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));