RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 22:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

os/bluestore: extent_t -> pextent_t

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-06-15 05:17:21 -04:00
parent 94fac96aa0
commit 80d789f1a1
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1892,7 +1892,7 @@ int BlueStore::_reconcile_bluefs_freespace()
return 0;
}
int BlueStore::_balance_bluefs_freespace(vector<bluestore_extent_t> *extents,
int BlueStore::_balance_bluefs_freespace(vector<bluestore_pextent_t> *extents,
KeyValueDB::Transaction t)
{
int ret = 0;
@ -1969,16 +1969,18 @@ int BlueStore::_balance_bluefs_freespace(vector<bluestore_extent_t> *extents,
int r = alloc->reserve(gift);
assert(r == 0);
bluestore_extent_t e;
r = alloc->allocate(gift, min_alloc_size, 0, &e.offset, &e.length);
uint64_t eoffset;
uint32_t elength;
r = alloc->allocate(gift, min_alloc_size, 0, &eoffset, &elength);
if (r < 0) {
assert(0 == "allocate failed, wtf");
return r;
}
if (e.length < gift) {
alloc->unreserve(gift - e.length);
if (elength < gift) {
alloc->unreserve(gift - elength);
}
bluestore_pextent_t e(eoffset, elength);
dout(1) << __func__ << " gifting " << e << " to bluefs" << dendl;
extents->push_back(e);
ret = 1;
@ -2013,7 +2015,7 @@ int BlueStore::_balance_bluefs_freespace(vector<bluestore_extent_t> *extents,
}
void BlueStore::_commit_bluefs_freespace(
const vector<bluestore_extent_t>& bluefs_gift_extents)
const vector<bluestore_pextent_t>& bluefs_gift_extents)
{
dout(10) << __func__ << dendl;
for (auto& p : bluefs_gift_extents) {
@ -4635,7 +4637,7 @@ void BlueStore::_kv_sync_thread()
// one final transaction to force a sync
KeyValueDB::Transaction t = db->get_transaction();
vector<bluestore_extent_t> bluefs_gift_extents;
vector<bluestore_pextent_t> bluefs_gift_extents;
if (bluefs) {
int r = _balance_bluefs_freespace(&bluefs_gift_extents, t);
assert(r >= 0);

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

@ -1061,9 +1061,9 @@ private:
int _open_super_meta();
int _reconcile_bluefs_freespace();
int _balance_bluefs_freespace(vector<bluestore_extent_t> *extents,
int _balance_bluefs_freespace(vector<bluestore_pextent_t> *extents,
KeyValueDB::Transaction t);
void _commit_bluefs_freespace(const vector<bluestore_extent_t>& extents);
void _commit_bluefs_freespace(const vector<bluestore_pextent_t>& extents);
CollectionRef _get_collection(const coll_t& cid);
void _queue_reap_collection(CollectionRef& c);