]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore/BlueStore: use BlueFS::get_usage()
authorSage Weil <sage@redhat.com>
Mon, 21 Dec 2015 21:18:05 +0000 (16:18 -0500)
committerSage Weil <sage@redhat.com>
Fri, 1 Jan 2016 18:07:20 +0000 (13:07 -0500)
...just so we log bdev utilization in the log.

Signed-off-by: Sage Weil <sage@redhat.com>
src/os/bluestore/BlueStore.cc

index 6f77c0408c08b9143b21cb4c2e3366d431053f64..b12ed047a64005f5147140cdc2802e62cb071cef 100644 (file)
@@ -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();