test/librbd: avoid config-related crashes in DiscardWithPruneWriteOverlap

For reasons that I think no longer apply today, set_val() and
set_val_or_die() refuse to set "type: str" config options that aren't
marked as "can be changed at runtime" -- set_val() returns an error and
set_val_or_die() terminates the process.  What is and isn't marked as
"can be changed at runtime" seems to be pretty much random both within
and outside of RBD, so let's just refactor how config is set here.

While at it, I realized that reproducer config is underspecified:

- for rbd_cache_policy and rbd_cache_writethrough_until_flush settings
  to matter, rbd_cache must be set to true and rbd_cache_max_dirty must
  be set to a positive number

- order should be set explicitly, because rbd_default_order can be as
  low as 12 (for 4096-byte objects), interfering with the logic of the
  test

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit de397f7588897fb0a3f15dcddf660c8e569b1e4e)

diff --git a/src/test/librbd/journal/test_Stress.cc b/src/test/librbd/journal/test_Stress.cc
index d2b9353fb5f8dd7f32e12b0b4e9670121d877da2..5abdc8bae80715d7f358aa910ccae92f776af301 100644 (file)
--- a/src/test/librbd/journal/test_Stress.cc
+++ b/src/test/librbd/journal/test_Stress.cc
@@ -1,6 +1,7 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab
 
+#include "test/librados/test_cxx.h"
 #include "test/librbd/test_fixture.h"
 #include "test/librbd/test_support.h"
 #include "cls/rbd/cls_rbd_types.h"
@@ -21,6 +22,7 @@
 #include "librbd/io/ImageRequest.h"
 #include "librbd/io/ReadResult.h"
 #include "librbd/journal/Types.h"
+#include <boost/scope_exit.hpp>
 
 void register_test_journal_stress() {
 }
@@ -39,23 +41,37 @@ TEST_F(TestJournalStress, DiscardWithPruneWriteOverlap) {
 
   // Create an image that is multiple objects so that we can force multiple
   // image extents on the discard path.
-  CephContext* cct = reinterpret_cast<CephContext*>(_rados.cct());
-  auto object_size = 1ull << cct->_conf.get_val<uint64_t>("rbd_default_order");
+  int order = 22;
+  auto object_size = uint64_t{1} << order;
   auto image_size = 4 * object_size;
 
   // 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");
+  std::map<std::string, std::string> config;
+  config["rbd_cache"] = "true";
+  config["rbd_cache_policy"] = "writearound";
+  config["rbd_cache_max_dirty"] = std::to_string(image_size);
+  config["rbd_cache_writethrough_until_flush"] = "false";
   // 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);
+  config["librados_thread_count"] = "15";
 
+  librados::Rados rados;
+  ASSERT_EQ("", connect_cluster_pp(rados, config));
+
+  librados::IoCtx ioctx;
+  ASSERT_EQ(0, rados.ioctx_create(_pool_name.c_str(), ioctx));
+
+  uint64_t features;
+  ASSERT_TRUE(::get_features(&features));
   auto image_name = get_temp_image_name();
-  ASSERT_EQ(0, create_image_pp(m_rbd, m_ioctx, image_name, image_size));
+  ASSERT_EQ(0, create_image_full_pp(m_rbd, ioctx, image_name, image_size,
+                                    features, false, &order));
 
-  librbd::ImageCtx *ictx;
-  ASSERT_EQ(0, open_image(image_name, &ictx));
+  auto ictx = new librbd::ImageCtx(image_name, "", nullptr, ioctx, false);
+  ASSERT_EQ(0, ictx->state->open(0));
+  BOOST_SCOPE_EXIT(ictx) {
+    ictx->state->close();
+  } BOOST_SCOPE_EXIT_END;
 
   std::thread write_thread(
     [ictx, object_size]() {