@@ -269,11 +269,11 @@ struct object_data_handler_test_t:
269269 return tm_teardown ();
270270 }
271271
272- void set_overwrite_threshold () {
272+ void enable_delta_based_overwrite () {
273273 crimson::common::local_conf ().set_val (" seastore_data_delta_based_overwrite" ,
274274 " 16777216" ).get ();
275275 }
276- void unset_overwrite_threshold () {
276+ void disable_delta_based_overwrite () {
277277 crimson::common::local_conf ().set_val (" seastore_data_delta_based_overwrite" , " 0" ).get ();
278278 }
279279
@@ -468,8 +468,9 @@ TEST_P(object_data_handler_test_t, multi_write)
468468TEST_P (object_data_handler_test_t , delta_over_multi_write)
469469{
470470 run_async ([this ] {
471- set_overwrite_threshold ();
471+ enable_delta_based_overwrite ();
472472 test_multi_write ();
473+ disable_delta_based_overwrite ();
473474 });
474475}
475476
@@ -483,8 +484,9 @@ TEST_P(object_data_handler_test_t, write_hole)
483484TEST_P (object_data_handler_test_t , delta_over_write_hole)
484485{
485486 run_async ([this ] {
486- set_overwrite_threshold ();
487+ enable_delta_based_overwrite ();
487488 test_write_hole ();
489+ disable_delta_based_overwrite ();
488490 });
489491}
490492
@@ -498,9 +500,9 @@ TEST_P(object_data_handler_test_t, overwrite_single)
498500TEST_P (object_data_handler_test_t , delta_over_overwrite_single)
499501{
500502 run_async ([this ] {
501- set_overwrite_threshold ();
503+ enable_delta_based_overwrite ();
502504 test_overwrite_single ();
503- unset_overwrite_threshold ();
505+ disable_delta_based_overwrite ();
504506 });
505507}
506508
@@ -514,9 +516,9 @@ TEST_P(object_data_handler_test_t, overwrite_double)
514516TEST_P (object_data_handler_test_t , delta_over_overwrite_double)
515517{
516518 run_async ([this ] {
517- set_overwrite_threshold ();
519+ enable_delta_based_overwrite ();
518520 test_overwrite_double ();
519- unset_overwrite_threshold ();
521+ disable_delta_based_overwrite ();
520522 });
521523}
522524
@@ -530,9 +532,9 @@ TEST_P(object_data_handler_test_t, overwrite_partial)
530532TEST_P (object_data_handler_test_t , delta_over_overwrite_partial)
531533{
532534 run_async ([this ] {
533- set_overwrite_threshold ();
535+ enable_delta_based_overwrite ();
534536 test_overwrite_partial ();
535- unset_overwrite_threshold ();
537+ disable_delta_based_overwrite ();
536538 });
537539}
538540
@@ -546,9 +548,9 @@ TEST_P(object_data_handler_test_t, unaligned_write)
546548TEST_P (object_data_handler_test_t , delta_over_unaligned_write)
547549{
548550 run_async ([this ] {
549- set_overwrite_threshold ();
551+ enable_delta_based_overwrite ();
550552 test_unaligned_write ();
551- unset_overwrite_threshold ();
553+ disable_delta_based_overwrite ();
552554 });
553555}
554556
@@ -562,9 +564,9 @@ TEST_P(object_data_handler_test_t, unaligned_overwrite)
562564TEST_P (object_data_handler_test_t , delta_over_unaligned_overwrite)
563565{
564566 run_async ([this ] {
565- set_overwrite_threshold ();
567+ enable_delta_based_overwrite ();
566568 test_unaligned_overwrite ();
567- unset_overwrite_threshold ();
569+ disable_delta_based_overwrite ();
568570 });
569571}
570572
@@ -578,9 +580,9 @@ TEST_P(object_data_handler_test_t, truncate)
578580TEST_P (object_data_handler_test_t , delta_over_truncate)
579581{
580582 run_async ([this ] {
581- set_overwrite_threshold ();
583+ enable_delta_based_overwrite ();
582584 test_truncate ();
583- unset_overwrite_threshold ();
585+ disable_delta_based_overwrite ();
584586 });
585587}
586588
@@ -592,9 +594,9 @@ TEST_P(object_data_handler_test_t, no_remap) {
592594
593595TEST_P (object_data_handler_test_t , no_overwrite) {
594596 run_async ([this ] {
595- set_overwrite_threshold ();
597+ enable_delta_based_overwrite ();
596598 write_same ();
597- unset_overwrite_threshold ();
599+ disable_delta_based_overwrite ();
598600 });
599601}
600602
@@ -618,13 +620,13 @@ TEST_P(object_data_handler_test_t, remap_left) {
618620
619621TEST_P (object_data_handler_test_t , overwrite_right) {
620622 run_async ([this ] {
621- set_overwrite_threshold ();
623+ enable_delta_based_overwrite ();
622624 write_right ();
623625
624626 auto pins = get_mappings (0 , 128 <<10 );
625627 EXPECT_EQ (pins.size (), 1 );
626628 read (0 , 128 <<10 );
627- unset_overwrite_threshold ();
629+ disable_delta_based_overwrite ();
628630 });
629631}
630632
@@ -648,12 +650,12 @@ TEST_P(object_data_handler_test_t, remap_right) {
648650
649651TEST_P (object_data_handler_test_t , overwrite_left) {
650652 run_async ([this ] {
651- set_overwrite_threshold ();
653+ enable_delta_based_overwrite ();
652654 write_left ();
653655 auto pins = get_mappings (0 , 128 <<10 );
654656 EXPECT_EQ (pins.size (), 1 );
655657 read (0 , 128 <<10 );
656- unset_overwrite_threshold ();
658+ disable_delta_based_overwrite ();
657659 });
658660}
659661
@@ -676,12 +678,12 @@ TEST_P(object_data_handler_test_t, remap_right_left) {
676678
677679TEST_P (object_data_handler_test_t , overwrite_right_left) {
678680 run_async ([this ] {
679- set_overwrite_threshold ();
681+ enable_delta_based_overwrite ();
680682 write_right_left ();
681683 auto pins = get_mappings (0 , 128 <<10 );
682684 EXPECT_EQ (pins.size (), 1 );
683685 read (0 , 128 <<10 );
684- unset_overwrite_threshold ();
686+ disable_delta_based_overwrite ();
685687 });
686688}
687689
@@ -704,12 +706,12 @@ TEST_P(object_data_handler_test_t, multiple_remap) {
704706
705707TEST_P (object_data_handler_test_t , multiple_overwrite) {
706708 run_async ([this ] {
707- set_overwrite_threshold ();
709+ enable_delta_based_overwrite ();
708710 multiple_write ();
709711 auto pins = get_mappings (0 , 128 <<10 );
710712 EXPECT_EQ (pins.size (), 1 );
711713 read (0 , 128 <<10 );
712- unset_overwrite_threshold ();
714+ disable_delta_based_overwrite ();
713715 });
714716}
715717
@@ -718,7 +720,7 @@ TEST_P(object_data_handler_test_t, random_overwrite) {
718720 constexpr size_t BSIZE = 4 <<10 ;
719721 constexpr size_t BLOCKS = TOTAL / BSIZE;
720722 run_async ([this ] {
721- set_overwrite_threshold ();
723+ enable_delta_based_overwrite ();
722724 size_t wsize = std::uniform_int_distribution<>(10 , BSIZE - 1 )(gen);
723725 uint8_t div[3 ] = {1 , 2 , 4 };
724726 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) {
741743 logger ().info (" random_writes: {} done replaying/checking" , i);
742744 }
743745 read (0 , 4 <<20 );
744- unset_overwrite_threshold ();
746+ disable_delta_based_overwrite ();
745747 });
746748}
747749
748750TEST_P (object_data_handler_test_t , overwrite_then_read_within_transaction) {
749751 run_async ([this ] {
750- set_overwrite_threshold ();
752+ enable_delta_based_overwrite ();
751753 auto t = create_mutate_transaction ();
752754 auto base = 4096 * 4 ;
753755 auto len = 4096 * 6 ;
@@ -827,7 +829,7 @@ TEST_P(object_data_handler_test_t, overwrite_then_read_within_transaction) {
827829 4096 ));
828830 EXPECT_EQ (committed.length (), pending.length ());
829831 EXPECT_NE (committed, pending);
830- unset_overwrite_threshold ();
832+ disable_delta_based_overwrite ();
831833 });
832834}
833835
0 commit comments