mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-01-07 20:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

small btree balancing

Browse Source 
While we are filling blocks the final block may not have enough items
to properly fill that block. Here we add a check that stops filling
the block if we have less than the minimum amount of items.

Signed-off-by: Hunter Shaffer <hunter.shaffer@versity.com>
This commit is contained in:
Hunter Shaffer
2025-02-25 16:27:07 -05:00
committed by Auke Kok
parent 200b286b7b
commit 7b121d9860
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/src/parallel_restore.c
View File

@@ -1030,6 +1030,8 @@ static spr_err_t build_btree_block(struct scoutfs_parallel_restore_writer *wri,
unsigned long val_align;
unsigned long bytes;
unsigned long nr;
unsigned long min_items;
long item_bytes_after_block;
void *val_buf;
spr_err_t err;
u8 height;
@@ -1083,10 +1085,16 @@ static spr_err_t build_btree_block(struct scoutfs_parallel_restore_writer *wri,
for_each_bti_safe(&btb->items[level].root, bti, tmp) {
val_align = round_up(bti->val_len, SCOUTFS_BTREE_VALUE_ALIGN);
bytes = sizeof(struct scoutfs_btree_item) + val_align;
item_bytes_after_block = (le64_to_cpu(btb->total_items) * bytes) - le16_to_cpu(bt->mid_free_len);
min_items = (SCOUTFS_BLOCK_LG_SIZE - sizeof(struct scoutfs_btree_block)) / 4;
if (le16_to_cpu(bt->mid_free_len) < bytes)
break;
/* stop when there are not enough items to fill the next block */
if (item_bytes_after_block > 0 && item_bytes_after_block < min_items)
break;
item->node.height = UNLINKED_AVL_HEIGHT;
item->key = bti->key;
item->seq = cpu_to_le64(1);