From: Sage Weil <sage@redhat.com>
Date: Mon, 21 Dec 2015 21:18:05 +0000 (-0500)
Subject: os/bluestore/BlueStore: use BlueFS::get_usage()
X-Git-Tag: v10.0.3~154^2~104
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d2bb7a79e4c70b086687980c087d4d8f564a1cb;p=ceph.git

os/bluestore/BlueStore: use BlueFS::get_usage()

...just so we log bdev utilization in the log.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index 6f77c0408c08..b12ed047a640 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -1297,9 +1297,13 @@ int BlueStore::_balance_bluefs_freespace(vector<bluestore_extent_t> *extents)
   int ret = 0;
   assert(bluefs);
 
+  vector<pair<uint64_t,uint64_t>> bluefs_usage;  // <free, total> ...
+  bluefs->get_usage(&bluefs_usage);
+  assert(bluefs_usage.size() > bluefs_shared_bdev);
+
   // fixme: look at primary bdev only for now
-  uint64_t bluefs_total = bluefs->get_total(bluefs_shared_bdev);
-  uint64_t bluefs_free = bluefs->get_free(bluefs_shared_bdev);
+  uint64_t bluefs_free = bluefs_usage[bluefs_shared_bdev].first;
+  uint64_t bluefs_total = bluefs_usage[bluefs_shared_bdev].second;
   float bluefs_free_ratio = (float)bluefs_free / (float)bluefs_total;
 
   uint64_t my_free = alloc->get_free();