diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:17 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-23 16:45:44 +0000 |
| commit | 17d6a993fc17d533460c5f40f3908c708e057c18 (patch) | |
| tree | 1a3bd93e0ecd74fa02f93a528fe2f87e5314c4b5 /src/os/bluestore/BlueStore.cc | |
| parent | Releasing progress-linux version 18.2.2-0progress7.99u1. (diff) | |
| download | ceph-17d6a993fc17d533460c5f40f3908c708e057c18.tar.xz ceph-17d6a993fc17d533460c5f40f3908c708e057c18.zip | |
Merging upstream version 18.2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/os/bluestore/BlueStore.cc')
| -rw-r--r-- | src/os/bluestore/BlueStore.cc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index aa14d0204..046f820b5 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5028,7 +5028,9 @@ void BlueStore::_init_logger() PerfCountersBuilder::PRIO_CRITICAL, unit_t(UNIT_BYTES)); b.add_u64(l_bluestore_fragmentation, "fragmentation_micros", - "How fragmented bluestore free space is (free extents / max possible number of free extents) * 1000"); + "How fragmented bluestore free space is (free extents / max possible number of free extents) * 1000", + "fbss", + PerfCountersBuilder::PRIO_USEFUL); b.add_u64(l_bluestore_alloc_unit, "alloc_unit", "allocation unit size in bytes", "au_b", @@ -7655,17 +7657,16 @@ int BlueStore::expand_devices(ostream& out) << std::endl; } } + _close_db_and_around(); + // mount in read/write to sync expansion changes + r = _mount(); + ceph_assert(r == 0); if (fm && fm->is_null_manager()) { // we grow the allocation range, must reflect it in the allocation file alloc->init_add_free(size0, size - size0); need_to_destage_allocation_file = true; } - _close_db_and_around(); - - // mount in read/write to sync expansion changes - r = _mount(); - ceph_assert(r == 0); umount(); } else { _close_db_and_around(); @@ -10373,6 +10374,7 @@ void BlueStore::collect_metadata(map<string,string> *pm) } } (*pm)["bluestore_min_alloc_size"] = stringify(min_alloc_size); + (*pm)["bluestore_allocation_from_file"] = stringify(fm && fm->is_null_manager()); } int BlueStore::get_numa_node( |