From 384bd8e28f58e503388d54e99e4adf019dad758e Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 3 Jun 2023 01:04:34 +0300 Subject: [PATCH] Support old metadata format in vitastor-disk dump-meta --- src/blockstore_disk.cpp | 1 - src/disk_tool_meta.cpp | 16 +++++++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/blockstore_disk.cpp b/src/blockstore_disk.cpp index bab7eda1..7a9fd81b 100644 --- a/src/blockstore_disk.cpp +++ b/src/blockstore_disk.cpp @@ -191,7 +191,6 @@ void blockstore_disk_t::calc_lengths(bool skip_meta_check) // required metadata size block_count = data_len / data_block_size; meta_len = (1 + (block_count - 1 + meta_block_size / clean_entry_size) / (meta_block_size / clean_entry_size)) * meta_block_size; - meta_version = BLOCKSTORE_META_VERSION_V2; if (!skip_meta_check && meta_area_size < meta_len) { if (!data_csum_type && !meta_version) diff --git a/src/disk_tool_meta.cpp b/src/disk_tool_meta.cpp index efaef0b8..015ccb21 100644 --- a/src/disk_tool_meta.cpp +++ b/src/disk_tool_meta.cpp @@ -74,6 +74,7 @@ int disk_tool_t::process_meta(std::function hdr = (blockstore_meta_header_v2_t *)data; } } + dsk.meta_version = hdr->version; dsk.data_block_size = hdr->data_block_size; dsk.csum_block_size = hdr->csum_block_size; dsk.data_csum_type = hdr->data_csum_type; @@ -83,9 +84,11 @@ int disk_tool_t::process_meta(std::function + (hdr->data_csum_type ? ((hdr->data_block_size+hdr->csum_block_size-1)/hdr->csum_block_size *(hdr->data_csum_type & 0xff)) - : 0) + 4 /*entry_csum*/; + : 0) + + (dsk.meta_version == BLOCKSTORE_META_VERSION_V2 ? 4 /*entry_csum*/ : 0); uint64_t block_num = 0; hdr_fn(hdr); + hdr = NULL; meta_pos = dsk.meta_block_size; lseek64(dsk.meta_fd, dsk.meta_offset+meta_pos, 0); while (meta_pos < dsk.meta_len) @@ -100,11 +103,14 @@ int disk_tool_t::process_meta(std::function clean_disk_entry *entry = (clean_disk_entry*)((uint8_t*)data + blk + ioff); if (entry->oid.inode) { - uint32_t *entry_csum = (uint32_t*)((uint8_t*)entry + dsk.clean_entry_size - 4); - if (*entry_csum != crc32c(0, entry, dsk.clean_entry_size - 4)) + if (dsk.data_csum_type) { - fprintf(stderr, "Metadata entry %lu is corrupt (checksum mismatch), skipping\n", block_num); - continue; + uint32_t *entry_csum = (uint32_t*)((uint8_t*)entry + dsk.clean_entry_size - 4); + if (*entry_csum != crc32c(0, entry, dsk.clean_entry_size - 4)) + { + fprintf(stderr, "Metadata entry %lu is corrupt (checksum mismatch), skipping\n", block_num); + continue; + } } record_fn(block_num, entry, entry->bitmap); }