Merge pull request ceph#64714 from chanyoung/fix-rebalancing-assertion

crimson/.../linked_tree_node: fix pivot_idx assertion in balancing

Reviewed-by: Xuehan Xu <[email protected]>

Author: Matan-B

src/crimson/os/seastore/btree/fixed_kv_node.h

@@ -349,6 +349,8 @@ struct FixedKVInternalNode
     auto replacement_right = c.cache.template alloc_new_non_data_extent<node_type_t>(
       c.trans, node_size, placement_hint_t::HOT, INIT_GENERATION);
 
+    // We should do full merge if pivot_idx == right.get_size().
+    ceph_assert(pivot_idx != right.get_size());
     this->balance_child_ptrs(
       c.trans,
       static_cast<node_type_t&>(*this),

src/crimson/os/seastore/lba/lba_btree_node.h

@@ -266,6 +266,8 @@ struct LBALeafNode
     uint32_t pivot_idx,
     LBALeafNode &replacement_left,
     LBALeafNode &replacement_right) final {
+    // We should do full merge if pivot_idx == right.get_size().
+    ceph_assert(pivot_idx != right.get_size());
     this->balance_child_ptrs(
       t, left, right, pivot_idx, replacement_left, replacement_right);
   }

src/crimson/os/seastore/linked_tree_node.h

@@ -655,7 +655,7 @@ class ParentNode {
     size_t l_size = left.get_size();
     size_t r_size = right.get_size();
 
-    ceph_assert(pivot_idx != l_size && pivot_idx != r_size);
+    ceph_assert(pivot_idx != l_size);
     replacement_left.maybe_expand_children(pivot_idx);
     replacement_right.maybe_expand_children(r_size + l_size - pivot_idx);
 

src/test/crimson/seastore/test_omap_manager.cc

@@ -837,6 +837,28 @@ TEST_P(omap_manager_test_t, full_range_list)
   });
 }
 
+TEST_P(omap_manager_test_t, increasing_key_size)
+{
+  // reproduces https://tracker.ceph.com/issues/72303
+  run_async([this] {
+    omap_root_t omap_root = initialize();
+
+    for (int i = 0; i < 1000; i++) {
+      auto t = create_mutate_transaction();
+      std::string key(i, 'A');
+      set_key(omap_root, *t, key, rand_buffer(1024));
+      submit_transaction(std::move(t));
+    }
+    check_mappings(omap_root);
+
+    while (test_omap_mappings.size() > 0) {
+      auto t = create_mutate_transaction();
+      rm_key(omap_root, *t, test_omap_mappings.begin()->first);
+      submit_transaction(std::move(t));
+    }
+  });
+}
+
 INSTANTIATE_TEST_SUITE_P(
   omap_manager_test,
   omap_manager_test_t,