osd: account for key_index_bytes when calculating chained read bitmap_len #89

Merged

vitalif merged 1 commits from changwei.ye/vitastor:fix-bitmap-len into master 2026-10-11 12:49:10 +03:00

Conversation 2 Commits 1 Files Changed 2 +69 -3

changwei.ye commented 2026-10-09 12:24:32 +03:00

Contributor

Copy Link

Description

osd: account for key_index_bytes when calculating chained read bitmap_len

When OSD_OP_RETURN_CHAIN is set, the primary OSD appends chain info to
the returned bitmap buffer. The space required for chain info is
(len / bs_bitmap_granularity) * key_index_bytes, where key_index_bytes
depends on the snapshot chain depth (1 byte for <= 255 items, 2 bytes for
<= 65535, etc.).

Previously, cur_op->reply.rw.bitmap_len only added (len / bs_bitmap_granularity)
without multiplying by key_index_bytes. When the snapshot chain depth
exceeded 255 (key_index_bytes == 2), the reported bitmap_len was too short,
causing the client to receive truncated chain info.

Multiply by key_index_bytes when updating cur_op->reply.rw.bitmap_len, and
add test_chained_read_large_chain_info regression test in osd_test.

Contributor Name

Changwei Ye (Datatom, https://www.datatom.com/)

CLA

• I accept Vitastor CLA agreement: https://git.yourcmc.ru/vitalif/vitastor/src/branch/master/CLA-en.md

### Description osd: account for key_index_bytes when calculating chained read bitmap_len When OSD_OP_RETURN_CHAIN is set, the primary OSD appends chain info to the returned bitmap buffer. The space required for chain info is (len / bs_bitmap_granularity) * key_index_bytes, where key_index_bytes depends on the snapshot chain depth (1 byte for <= 255 items, 2 bytes for <= 65535, etc.). Previously, cur_op->reply.rw.bitmap_len only added (len / bs_bitmap_granularity) without multiplying by key_index_bytes. When the snapshot chain depth exceeded 255 (key_index_bytes == 2), the reported bitmap_len was too short, causing the client to receive truncated chain info. Multiply by key_index_bytes when updating cur_op->reply.rw.bitmap_len, and add test_chained_read_large_chain_info regression test in osd_test. ### Contributor Name Changwei Ye (Datatom, https://www.datatom.com/) ### CLA - [x] I accept Vitastor CLA agreement: https://git.yourcmc.ru/vitalif/vitastor/src/branch/master/CLA-en.md

changwei.ye added 1 commit 2026-10-09 12:24:33 +03:00

osd: account for key_index_bytes when calculating chained read bitmap_len ... 45ce3f2842

When OSD_OP_RETURN_CHAIN is set, the primary OSD appends chain info to
the returned bitmap buffer. The space required for chain info is
(len / bs_bitmap_granularity) * key_index_bytes, where key_index_bytes
depends on the snapshot chain depth (1 byte for <= 255 items, 2 bytes for
<= 65535, etc.).

Previously, cur_op->reply.rw.bitmap_len only added (len / bs_bitmap_granularity)
without multiplying by key_index_bytes. When the snapshot chain depth
exceeded 255 (key_index_bytes == 2), the reported bitmap_len was too short,
causing the client to receive truncated chain info.

Multiply by key_index_bytes when updating cur_op->reply.rw.bitmap_len, and
add test_chained_read_large_chain_info regression test in osd_test.

changwei.ye requested review from vitalif 2026-10-09 12:24:45 +03:00

vitalif approved these changes 2026-10-11 12:49:01 +03:00

vitalif merged commit 45ce3f2842 into master 2026-10-11 12:49:10 +03:00

vitalif commented 2026-10-11 12:49:17 +03:00

Owner

Copy Link

Thanks, merged!

Thanks, merged!

Sign in to join this conversation.

Reviewers

No Reviewers

vitalif

Labels

No items

No Label

Milestone

No items

No Milestone

Assignees

Clear assignees

vitalif

No Assignees

2 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: vitalif/vitastor#89

Allow edits from maintainers

No description provided.