From ccd1db23fa3dd82a0ec60914fc84ae0ba96f3ae1 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 14 Mar 2017 17:09:18 -0400 Subject: [PATCH] os/bluestore/BlueFS: measure used bytes, not free bytes This is more useful info for humans. Signed-off-by: Sage Weil --- src/os/bluestore/BlueFS.cc | 21 ++++++++++++--------- src/os/bluestore/BlueFS.h | 6 +++--- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 6b725eac818ee..3f7fa0f2a0ce5 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -61,16 +61,16 @@ void BlueFS::_init_logger() "Bytes reclaimed by BlueStore"); b.add_u64(l_bluefs_db_total_bytes, "db_total_bytes", "Total bytes (main db device)"); - b.add_u64(l_bluefs_db_free_bytes, "db_free_bytes", - "Free bytes (main db device)"); + b.add_u64(l_bluefs_db_used_bytes, "db_used_bytes", + "Used bytes (main db device)"); b.add_u64(l_bluefs_wal_total_bytes, "wal_total_bytes", "Total bytes (wal device)"); - b.add_u64(l_bluefs_wal_free_bytes, "wal_free_bytes", - "Free bytes (wal device)"); + b.add_u64(l_bluefs_wal_used_bytes, "wal_used_bytes", + "Used bytes (wal device)"); b.add_u64(l_bluefs_slow_total_bytes, "slow_total_bytes", "Total bytes (slow device)"); - b.add_u64(l_bluefs_slow_free_bytes, "slow_free_bytes", - "Free bytes (slow device)"); + b.add_u64(l_bluefs_slow_used_bytes, "slow_used_bytes", + "Used bytes (slow device)"); b.add_u64(l_bluefs_num_files, "num_files", "File count"); b.add_u64(l_bluefs_log_bytes, "log_bytes", "Size of the metadata log"); b.add_u64_counter(l_bluefs_log_compactions, "log_compactions", @@ -103,15 +103,18 @@ void BlueFS::_update_logger_stats() if (alloc[BDEV_WAL]) { logger->set(l_bluefs_wal_total_bytes, block_total[BDEV_WAL]); - logger->set(l_bluefs_wal_free_bytes, alloc[BDEV_WAL]->get_free()); + logger->set(l_bluefs_wal_used_bytes, + block_total[BDEV_WAL] - alloc[BDEV_WAL]->get_free()); } if (alloc[BDEV_DB]) { logger->set(l_bluefs_db_total_bytes, block_total[BDEV_DB]); - logger->set(l_bluefs_db_free_bytes, alloc[BDEV_DB]->get_free()); + logger->set(l_bluefs_db_used_bytes, + block_total[BDEV_DB] - alloc[BDEV_DB]->get_free()); } if (alloc[BDEV_SLOW]) { logger->set(l_bluefs_slow_total_bytes, block_total[BDEV_SLOW]); - logger->set(l_bluefs_slow_free_bytes, alloc[BDEV_SLOW]->get_free()); + logger->set(l_bluefs_slow_used_bytes, + block_total[BDEV_SLOW] - alloc[BDEV_SLOW]->get_free()); } } diff --git a/src/os/bluestore/BlueFS.h b/src/os/bluestore/BlueFS.h index d8808c00d12de..37bf53ab530c6 100644 --- a/src/os/bluestore/BlueFS.h +++ b/src/os/bluestore/BlueFS.h @@ -22,11 +22,11 @@ enum { l_bluefs_gift_bytes, l_bluefs_reclaim_bytes, l_bluefs_db_total_bytes, - l_bluefs_db_free_bytes, + l_bluefs_db_used_bytes, l_bluefs_wal_total_bytes, - l_bluefs_wal_free_bytes, + l_bluefs_wal_used_bytes, l_bluefs_slow_total_bytes, - l_bluefs_slow_free_bytes, + l_bluefs_slow_used_bytes, l_bluefs_num_files, l_bluefs_log_bytes, l_bluefs_log_compactions, -- 2.39.5