Browse Source

Fix incorrect reading of extra metadata block

epoch-deletions
Vitaliy Filippov 4 weeks ago
parent
commit
e718116f54
  1. 14
      mon/mon.js
  2. 1
      src/blockstore_init.cpp
  3. 2
      src/osd_cluster.cpp

14
mon/mon.js

@ -224,15 +224,19 @@ const etcd_tree = {
}, */
},
inodestats: {
/* <inode_t>: {
read: { count: uint64_t, usec: uint64_t, bytes: uint64_t },
write: { count: uint64_t, usec: uint64_t, bytes: uint64_t },
delete: { count: uint64_t, usec: uint64_t, bytes: uint64_t },
/* <pool_id>: {
<inode_t>: {
read: { count: uint64_t, usec: uint64_t, bytes: uint64_t },
write: { count: uint64_t, usec: uint64_t, bytes: uint64_t },
delete: { count: uint64_t, usec: uint64_t, bytes: uint64_t },
},
}, */
},
space: {
/* <osd_num_t>: {
<inode_t>: uint64_t, // bytes
<pool_id>: {
<inode_t>: uint64_t, // bytes
},
}, */
},
},

1
src/blockstore_init.cpp

@ -131,6 +131,7 @@ resume_1:
}
// Skip superblock
bs->meta_offset += bs->meta_block_size;
bs->meta_len -= bs->meta_block_size;
prev_done = 0;
done_len = 0;
done_pos = 0;

2
src/osd_cluster.cpp

@ -189,7 +189,7 @@ void osd_t::report_statistics()
for (auto kv: bs->get_inode_space_stats())
{
pool_id_t pool_id = INODE_POOL(kv.first);
uint64_t only_inode_num = (kv.first & (((uint64_t)1 << (64-POOL_ID_BITS)) - 1));
uint64_t only_inode_num = INODE_NO_POOL(kv.first);
if (!last_pool || pool_id != last_pool)
{
if (last_pool)

Loading…
Cancel
Save