Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

os/bluestore: misc fixes #10771

Merged
merged 4 commits into from Aug 21, 2016
Merged

os/bluestore: misc fixes #10771

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
94a3964
os/bluestore: fix race condition during get_fs_usage()
xiexingguo Aug 19, 2016
8495245
os/bluestore: use bluefs_max_prefetch for log file prefetch
xiexingguo Aug 19, 2016
0c81578
os/bluestore: use hex if we are running out of space
xiexingguo Aug 19, 2016
d2cfbb9
os/bluestore: fix assert
xiexingguo Aug 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/os/bluestore/BlueFS.cc
View file
Open in desktop
Expand Up @@ -183,6 +183,7 @@ int BlueFS::reclaim_blocks(unsigned id, uint64_t want,

uint64_t BlueFS::get_fs_usage()
{
std::lock_guard<std::mutex> l(lock);
uint64_t total_bytes = 0;
for (auto& p : file_map) {
total_bytes += p.second->fnode.get_allocated();
Expand Down Expand Up @@ -472,7 +473,7 @@ int BlueFS::_replay(bool noop)
dout(10) << __func__ << " log_fnode " << super.log_fnode << dendl;

FileReader *log_reader = new FileReader(
log_file, g_conf->bluefs_alloc_size,
log_file, g_conf->bluefs_max_prefetch,
false, // !random
true); // ignore eof
while (true) {
Expand Down Expand Up @@ -1378,8 +1379,9 @@ int BlueFS::_flush_range(FileWriter *h, uint64_t offset, uint64_t length)
offset + length - allocated,
&h->file->fnode.extents);
if (r < 0) {
derr << __func__ << " allocated: " << allocated << \
" offset: " << offset << " length: " << length << dendl;
derr << __func__ << " allocated: 0x" << std::hex << allocated
<< " offset: 0x" << offset << " length: 0x" << length << std::dec
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please include the std::dec at the end

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@liewegas Sir, I did... The std::dec lies at the end of this line.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, yes, sorry about that!

<< dendl;
return r;
}
must_dirty = true;
Expand Down Expand Up @@ -1481,9 +1483,10 @@ int BlueFS::_flush_range(FileWriter *h, uint64_t offset, uint64_t length)
x_off = 0;
}
for (unsigned i = 0; i < MAX_BDEV; ++i) {
if (bdev[i] && h->iocv[i]->has_aios()) {
if (bdev[i]) {
assert(h->iocv[i]);
bdev[i]->aio_submit(h->iocv[i]);
if (h->iocv[i]->has_aios())
bdev[i]->aio_submit(h->iocv[i]);
}
}
dout(20) << __func__ << " h " << h << " pos now 0x"
Expand Down