RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17684 from majianpeng/bluefs-release-extents

Browse Source 
os/bluestore/BlueFS: move release unused extents work in _flush_and_syn_log

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-09-28 09:42:39 -05:00 committed by GitHub
commit bf8a109035
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/os/bluestore/BlueFS.cc
View File

@ -1357,6 +1357,9 @@ int BlueFS::_flush_and_sync_log(std::unique_lock<std::mutex>& l,
return 0;
}
vector<interval_set<uint64_t>> to_release(pending_release.size());
to_release.swap(pending_release);
uint64_t seq = log_t.seq = ++log_seq;
assert(want_seq == 0 || want_seq <= seq);
log_t.uuid = super.uuid;
@ -1450,6 +1453,13 @@ int BlueFS::_flush_and_sync_log(std::unique_lock<std::mutex>& l,
<< " already >= out seq " << seq
<< ", we lost a race against another log flush, done" << dendl;
}
for (unsigned i = 0; i < to_release.size(); ++i) {
for (auto p = to_release[i].begin(); p != to_release[i].end(); ++p) {
alloc[i]->release(p.get_start(), p.get_len());
}
}
_update_logger_stats();
return 0;
@ -1881,15 +1891,8 @@ void BlueFS::sync_metadata()
} else {
dout(10) << __func__ << dendl;
utime_t start = ceph_clock_now();
vector<interval_set<uint64_t>> to_release(pending_release.size());
to_release.swap(pending_release);
flush_bdev(); // FIXME?
_flush_and_sync_log(l);
for (unsigned i = 0; i < to_release.size(); ++i) {
for (auto p = to_release[i].begin(); p != to_release[i].end(); ++p) {
alloc[i]->release(p.get_start(), p.get_len());
}
}
dout(10) << __func__ << " done in " << (ceph_clock_now() - start) << dendl;
}