]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #24732 into master
authorSage Weil <sage@redhat.com>
Mon, 26 Nov 2018 15:21:22 +0000 (09:21 -0600)
committerSage Weil <sage@redhat.com>
Mon, 26 Nov 2018 15:21:22 +0000 (09:21 -0600)
* refs/pull/24732/head:
os/bluestore: fix missing assert->ceph_assert replacement.
os/bluestore: add bluefs perf counters to track DB/WAL/Slow volume

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/os/bluestore/BlueFS.cc
src/os/bluestore/BlueFS.h
src/os/bluestore/BlueStore.cc

Simple merge
Simple merge
Simple merge