diff --git a/mon/mon.js b/mon/mon.js index 82b7263f..69b7c20a 100644 --- a/mon/mon.js +++ b/mon/mon.js @@ -224,15 +224,19 @@ const etcd_tree = { }, */ }, inodestats: { - /* : { - 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 }, + /* : { + : { + 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: { /* : { - : uint64_t, // bytes + : { + : uint64_t, // bytes + }, }, */ }, }, diff --git a/src/blockstore_init.cpp b/src/blockstore_init.cpp index 56108c84..506a36cd 100644 --- a/src/blockstore_init.cpp +++ b/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; diff --git a/src/osd_cluster.cpp b/src/osd_cluster.cpp index 1b0baa1d..562b872f 100644 --- a/src/osd_cluster.cpp +++ b/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)