From 3ac0a7073152a6b47c8fc55627ce17fe99901847 Mon Sep 17 00:00:00 2001 From: myoungwon oh Date: Tue, 9 Apr 2024 06:31:12 +0000 Subject: [PATCH] test/crimson/seastore: rename set/unset_overwrite_threshold() to enable/disable_delta_based_overwrite() Signed-off-by: Myoungwon Oh (cherry picked from commit 24c0c198a5dd57070f210dc69dd83481df73fa15) --- .../seastore/test_object_data_handler.cc | 62 ++++++++++--------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/src/test/crimson/seastore/test_object_data_handler.cc b/src/test/crimson/seastore/test_object_data_handler.cc index ee2a80e97e09c..3066ac4592106 100644 --- a/src/test/crimson/seastore/test_object_data_handler.cc +++ b/src/test/crimson/seastore/test_object_data_handler.cc @@ -269,11 +269,11 @@ struct object_data_handler_test_t: return tm_teardown(); } - void set_overwrite_threshold() { + void enable_delta_based_overwrite() { crimson::common::local_conf().set_val("seastore_data_delta_based_overwrite", "16777216").get(); } - void unset_overwrite_threshold() { + void disable_delta_based_overwrite() { crimson::common::local_conf().set_val("seastore_data_delta_based_overwrite", "0").get(); } @@ -468,8 +468,9 @@ TEST_P(object_data_handler_test_t, multi_write) TEST_P(object_data_handler_test_t, delta_over_multi_write) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); test_multi_write(); + disable_delta_based_overwrite(); }); } @@ -483,8 +484,9 @@ TEST_P(object_data_handler_test_t, write_hole) TEST_P(object_data_handler_test_t, delta_over_write_hole) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); test_write_hole(); + disable_delta_based_overwrite(); }); } @@ -498,9 +500,9 @@ TEST_P(object_data_handler_test_t, overwrite_single) TEST_P(object_data_handler_test_t, delta_over_overwrite_single) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); test_overwrite_single(); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -514,9 +516,9 @@ TEST_P(object_data_handler_test_t, overwrite_double) TEST_P(object_data_handler_test_t, delta_over_overwrite_double) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); test_overwrite_double(); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -530,9 +532,9 @@ TEST_P(object_data_handler_test_t, overwrite_partial) TEST_P(object_data_handler_test_t, delta_over_overwrite_partial) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); test_overwrite_partial(); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -546,9 +548,9 @@ TEST_P(object_data_handler_test_t, unaligned_write) TEST_P(object_data_handler_test_t, delta_over_unaligned_write) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); test_unaligned_write(); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -562,9 +564,9 @@ TEST_P(object_data_handler_test_t, unaligned_overwrite) TEST_P(object_data_handler_test_t, delta_over_unaligned_overwrite) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); test_unaligned_overwrite(); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -578,9 +580,9 @@ TEST_P(object_data_handler_test_t, truncate) TEST_P(object_data_handler_test_t, delta_over_truncate) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); test_truncate(); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -592,9 +594,9 @@ TEST_P(object_data_handler_test_t, no_remap) { TEST_P(object_data_handler_test_t, no_overwrite) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); write_same(); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -618,13 +620,13 @@ TEST_P(object_data_handler_test_t, remap_left) { TEST_P(object_data_handler_test_t, overwrite_right) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); write_right(); auto pins = get_mappings(0, 128<<10); EXPECT_EQ(pins.size(), 1); read(0, 128<<10); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -648,12 +650,12 @@ TEST_P(object_data_handler_test_t, remap_right) { TEST_P(object_data_handler_test_t, overwrite_left) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); write_left(); auto pins = get_mappings(0, 128<<10); EXPECT_EQ(pins.size(), 1); read(0, 128<<10); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -676,12 +678,12 @@ TEST_P(object_data_handler_test_t, remap_right_left) { TEST_P(object_data_handler_test_t, overwrite_right_left) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); write_right_left(); auto pins = get_mappings(0, 128<<10); EXPECT_EQ(pins.size(), 1); read(0, 128<<10); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -704,12 +706,12 @@ TEST_P(object_data_handler_test_t, multiple_remap) { TEST_P(object_data_handler_test_t, multiple_overwrite) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); multiple_write(); auto pins = get_mappings(0, 128<<10); EXPECT_EQ(pins.size(), 1); read(0, 128<<10); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } @@ -718,7 +720,7 @@ TEST_P(object_data_handler_test_t, random_overwrite) { constexpr size_t BSIZE = 4<<10; constexpr size_t BLOCKS = TOTAL / BSIZE; run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); size_t wsize = std::uniform_int_distribution<>(10, BSIZE - 1)(gen); uint8_t div[3] = {1, 2, 4}; uint8_t block_num = div[std::uniform_int_distribution<>(0, 2)(gen)]; @@ -741,13 +743,13 @@ TEST_P(object_data_handler_test_t, random_overwrite) { logger().info("random_writes: {} done replaying/checking", i); } read(0, 4<<20); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } TEST_P(object_data_handler_test_t, overwrite_then_read_within_transaction) { run_async([this] { - set_overwrite_threshold(); + enable_delta_based_overwrite(); auto t = create_mutate_transaction(); auto base = 4096 * 4; auto len = 4096 * 6; @@ -827,7 +829,7 @@ TEST_P(object_data_handler_test_t, overwrite_then_read_within_transaction) { 4096)); EXPECT_EQ(committed.length(), pending.length()); EXPECT_NE(committed, pending); - unset_overwrite_threshold(); + disable_delta_based_overwrite(); }); } -- 2.39.5