From: Igor Fedotov <ifedotov@suse.com>
Date: Thu, 21 Jun 2018 18:44:21 +0000 (+0300)
Subject: os/bluestore_tool: print actual usage in BlueFS::dump_block_extents.
X-Git-Tag: v14.0.1~596^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F23515%2Fhead;p=ceph.git

os/bluestore_tool: print actual usage in BlueFS::dump_block_extents.

Hence we can see per-device bluefs usage from ceph-bluestore-tool.
Signed-off-by: Igor Fedotov <ifedotov@suse.com>
---

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
index 29e6217a5cc8e..bfb4e8a25bf8e 100644
--- a/src/os/bluestore/BlueFS.cc
+++ b/src/os/bluestore/BlueFS.cc
@@ -288,8 +288,13 @@ void BlueFS::dump_block_extents(ostream& out)
     if (!bdev[i]) {
       continue;
     }
-    out << i << " : size 0x" << std::hex << bdev[i]->get_size()
-	<< " : own 0x" << block_all[i] << std::dec << "\n";
+    auto owned = get_total(i);
+    auto free = get_free(i);
+    out << i << " : device size 0x" << std::hex << bdev[i]->get_size()
+        << " : own 0x" << block_all[i]
+        << " = 0x" << owned
+        << " : using 0x" << owned - free
+        << std::dec << "\n";
   }
 }