]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #18096 into master
authorSage Weil <sage@redhat.com>
Fri, 17 Aug 2018 18:56:22 +0000 (13:56 -0500)
committerSage Weil <sage@redhat.com>
Fri, 17 Aug 2018 18:56:22 +0000 (13:56 -0500)
commit2b2f0ec6a5056db2daa2c125e1cb417b1573e302
treefbbe6426ef87f66debdc93cc27424033795f775f
parent00b867fae2e8e912119fc47348dee78631c6f66b
parent04b47939b84f388c3a8c0b09077fe56b27d2f9f2
Merge PR #18096 into master

* refs/pull/18096/head:
os/bluestore: factor VDO into bluestore's 'allocated' value
os/filestore: estimate omap_allocated
os/ObjectMap: add get_db() accessor
osd/OSDMap: include data, omap in 'osd df' output
os/bluestore: report omap and internal metadata usage
os/bluestore/BlueFS: drop get_fs_usage(); add get_used()
kv: add per-prefix space estimation
osd: decouple statfs update from hb peers, pg count
osd: drop useless OSDService::update_osd_stat()
osd/osd_types: separate accounting for data, omap, and metadata
osd: re-add get_num_pgs()

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
src/os/bluestore/BlueStore.cc
src/osd/OSDMap.cc