From adacc20046c5f3a96b59df3fe01f9764e8437156 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 30 Jun 2019 15:06:37 -0500 Subject: [PATCH] ceph_test_rados_api_tier_pp: tolerate ENOENT or success from deleted snap Signed-off-by: Sage Weil --- src/test/librados/tier_cxx.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/test/librados/tier_cxx.cc b/src/test/librados/tier_cxx.cc index 88575527901..0f5c4ef2d8e 100644 --- a/src/test/librados/tier_cxx.cc +++ b/src/test/librados/tier_cxx.cc @@ -633,10 +633,12 @@ TEST_F(LibRadosTwoPoolsPP, PromoteSnapTrimRace) { ioctx.snap_set_read(my_snaps[0]); - // read foo snap + // read foo snap. the OSD may or may not realize that this snap has + // been logically deleted; either response is valid. { bufferlist bl; - ASSERT_EQ(-ENOENT, ioctx.read("foo", bl, 1, 0)); + int r = ioctx.read("foo", bl, 1, 0); + ASSERT_TRUE(r == 1 || r == -ENOENT); } // cleanup @@ -3961,10 +3963,12 @@ TEST_F(LibRadosTwoPoolsECPP, PromoteSnapTrimRace) { ioctx.snap_set_read(my_snaps[0]); - // read foo snap + // read foo snap. the OSD may or may not realize that this snap has + // been logically deleted; either response is valid. { bufferlist bl; - ASSERT_EQ(-ENOENT, ioctx.read("foo", bl, 1, 0)); + int r = ioctx.read("foo", bl, 1, 0); + ASSERT_TRUE(r == 1 || r == -ENOENT); } // cleanup -- 2.47.3