From 641f782ac7fbb98c36dc41085a616c5cabf3cb20 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Thu, 14 Oct 2021 20:35:16 +0200 Subject: [PATCH] test/librbd: don't run RemoveFullTry tests with persistent writeback cache Persistent writeback cache messes with pool quota enforcement on the OSD side and we don't always break out of the write zeroes loop: src/test/librbd/test_librbd.cc:2165: Failure Value of: off >= quota && off < size Actual: false Expected: true Unfortunately persistent writeback cache doesn't honor FUA [1] so the workaround for volatile caches from the previous patch doesn't apply. [1] https://tracker.ceph.com/issues/49715 Signed-off-by: Ilya Dryomov --- src/test/librbd/test_librbd.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/librbd/test_librbd.cc b/src/test/librbd/test_librbd.cc index 825b915d0992d..dd5f492a47c39 100644 --- a/src/test/librbd/test_librbd.cc +++ b/src/test/librbd/test_librbd.cc @@ -2165,6 +2165,7 @@ static void remove_full_try(rados_ioctx_t ioctx, const std::string& image_name, TEST_F(TestLibRBD, RemoveFullTry) { + REQUIRE(!is_rbd_pwl_enabled((CephContext *)_rados.cct())); REQUIRE(!is_librados_test_stub(_rados)); rados_ioctx_t ioctx; @@ -2189,6 +2190,7 @@ TEST_F(TestLibRBD, RemoveFullTry) TEST_F(TestLibRBD, RemoveFullTryDataPool) { REQUIRE_FORMAT_V2(); + REQUIRE(!is_rbd_pwl_enabled((CephContext *)_rados.cct())); REQUIRE(!is_librados_test_stub(_rados)); rados_ioctx_t ioctx; -- 2.39.5