From: Sage Weil <sage@redhat.com>
Date: Thu, 26 Jan 2017 19:22:53 +0000 (-0500)
Subject: os/bluestore: fix statfs to not include DB partition in free space
X-Git-Tag: v11.2.1~159^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1d25327b00f01e987dec022412edb95040d69a42;p=ceph.git

os/bluestore: fix statfs to not include DB partition in free space

If we report the DB space as vailable, ceph thinks the OSD can store more
data and will not mark the cluster as full as easily.  And in reality, we
can't actually store data in this space--only metadata.  Avoid the problem
by not reporting it as available.

Fixes: http://tracker.ceph.com/issues/18599
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit c66d5babb1e283869ba0f1f59029bead5ca5f37d)
---

diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc
index f876aa581e3..b95a50a3e4b 100644
--- a/src/os/bluestore/BlueStore.cc
+++ b/src/os/bluestore/BlueStore.cc
@@ -4717,7 +4717,6 @@ int BlueStore::statfs(struct store_statfs_t *buf)
 
     // include dedicated db, too, if that isn't the shared device.
     if (bluefs_shared_bdev != BlueFS::BDEV_DB) {
-      buf->available += bluefs->get_free(BlueFS::BDEV_DB);
       buf->total += bluefs->get_total(BlueFS::BDEV_DB);
     }
   }