]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: fix statfs to not include DB partition in free space 13284/head
authorSage Weil <sage@redhat.com>
Thu, 26 Jan 2017 19:22:53 +0000 (14:22 -0500)
committerShinobu Kinjo <shinobu@redhat.com>
Mon, 6 Feb 2017 23:28:31 +0000 (18:28 -0500)
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)

src/os/bluestore/BlueStore.cc

index f876aa581e324d12377c717895745b40970e7d32..b95a50a3e4b98479df284a2ab0991da79c543d3d 100644 (file)
@@ -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);
     }
   }