RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #26879 into master

Browse Source 
* refs/pull/26879/head:
	vstart.sh: make 'db' volume 1G instead of 64M
	os/bluestore: make bluefs spillover messages nicer

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
This commit is contained in:
Sage Weil 2019-03-11 15:00:56 -05:00
commit bb57b76e35
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mon/PGMap.cc
View File

@ -2966,7 +2966,7 @@ void PGMap::get_health_checks(
for (auto& a : osd_sum.os_alerts) {
int left = max;
string s0 = " osd:";
string s0 = " osd.";
s0 += stringify(a.first);
for (auto& aa : a.second) {
string s(s0);

9
src/os/bluestore/BlueStore.cc
View File

@ -5655,9 +5655,12 @@ int BlueStore::_balance_bluefs_freespace()
if (bluefs_shared_bdev == BlueFS::BDEV_SLOW) {
auto& p = bluefs_usage[bluefs_shared_bdev];
if (p.first != p.second) {
string s("spilled over to slow device: ");
s += stringify(byte_u_t(p.second - p.first));
_set_spillover_alert(s.c_str());
auto& db = bluefs_usage[BlueFS::BDEV_DB];
ostringstream ss;
ss << "spilled over " << byte_u_t(p.second - p.first)
<< " metadata from 'db' device (" << byte_u_t(db.second - db.first)
<< " used of " << byte_u_t(db.second) << ") to slow device";
_set_spillover_alert(ss.str());
clear_alert = false;
}
}

2
src/os/bluestore/BlueStore.h
View File

@ -2711,7 +2711,7 @@ private:
failed_cmode.clear();
}
void _set_spillover_alert(const char* s) {
void _set_spillover_alert(const string& s) {
std::lock_guard l(qlock);
spillover_alert = s;
}

2
src/vstart.sh
View File

@ -566,7 +566,7 @@ EOF
bluestore_block_path = spdk:$(get_pci_selector)"
else
BLUESTORE_OPTS=" bluestore block db path = $CEPH_DEV_DIR/osd\$id/block.db.file
bluestore block db size = 67108864
bluestore block db size = 1073741824
bluestore block db create = true
bluestore block wal path = $CEPH_DEV_DIR/osd\$id/block.wal.file
bluestore block wal size = 1048576000