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: generate same onode extent-shard keys in a more efficient way #12681

Merged
merged 1 commit into from Jan 18, 2017
Merged

os/bluestore: generate same onode extent-shard keys in a more efficient way #12681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
86 changes: 56 additions & 30 deletions src/os/bluestore/BlueStore.cc
View file
Open in desktop
Expand Up @@ -416,9 +416,23 @@ static void rewrite_extent_shard_key(uint32_t offset, string *key)
{
assert(key->size() > sizeof(uint32_t) + 1);
assert(*key->rbegin() == EXTENT_SHARD_KEY_SUFFIX);
string offstr;
_key_encode_u32(offset, &offstr);
key->replace(key->size() - sizeof(uint32_t) - 1, sizeof(uint32_t), offstr);
_key_encode_u32(offset, key->size() - sizeof(uint32_t) - 1, key);
}

template<typename S>
static void generate_extent_shard_key_and_apply(
const S& onode_key,
uint32_t offset,
string *key,
std::function<void(const string& final_key)> apply)
{
if (key->empty()) { // make full key
assert(!onode_key.empty());
get_extent_shard_key(onode_key, offset, key);
} else {
rewrite_extent_shard_key(offset, key);
}
apply(*key);
}

int get_key_extent_shard(const string& key, string *onode_key, uint32_t *offset)
Expand Down Expand Up @@ -1748,10 +1762,13 @@ bool BlueStore::ExtentMap::update(KeyValueDB::Transaction t,
}
//schedule DB update for dirty shards
auto it = dirty_shards.begin();
string key;
while (it != dirty_shards.end()) {
string key;
get_extent_shard_key(onode->key, it->offset, &key);
t->set(PREFIX_OBJ, key, it->bl);
generate_extent_shard_key_and_apply(onode->key, it->offset, &key,
[&](const string& final_key) {
t->set(PREFIX_OBJ, final_key, it->bl);
}
);
++it;
}
}
Expand Down Expand Up @@ -2136,24 +2153,22 @@ void BlueStore::ExtentMap::fault_range(
return;

assert(last >= start);
bool first_key = true;
string key;
while (start <= last) {
assert((size_t)start < shards.size());
auto p = &shards[start];
if (!p->loaded) {
if (first_key) {
get_extent_shard_key(onode->key, p->offset, &key);
first_key = false;
} else
rewrite_extent_shard_key(p->offset, &key);
bufferlist v;
int r = db->get(PREFIX_OBJ, key, &v);
if (r < 0) {
derr << __func__ << " missing shard 0x" << std::hex << p->offset
<< std::dec << " for " << onode->oid << dendl;
assert(r >= 0);
}
generate_extent_shard_key_and_apply(onode->key, p->offset, &key,
[&](const string& final_key) {
int r = db->get(PREFIX_OBJ, final_key, &v);
if (r < 0) {
derr << __func__ << " missing shard 0x" << std::hex << p->offset
<< std::dec << " for " << onode->oid << dendl;
assert(r >= 0);
}
}
);
decode_some(v);
p->loaded = true;
dout(20) << __func__ << " open shard 0x" << std::hex << p->offset
Expand Down Expand Up @@ -6567,10 +6582,13 @@ void BlueStore::_txc_write_nodes(TransContext *txc, KeyValueDB::Transaction t)
}
if (reshard) {
dout(20) << __func__ << " resharding extents for " << o->oid << dendl;
string key;
for (auto &s : o->extent_map.shards) {
string key;
get_extent_shard_key(o->key, s.offset, &key);
t->rmkey(PREFIX_OBJ, key);
generate_extent_shard_key_and_apply(o->key, s.offset, &key,
[&](const string& final_key) {
t->rmkey(PREFIX_OBJ, final_key);
}
);
}
o->extent_map.fault_range(db, 0, o->onode.size);
o->extent_map.reshard();
Expand Down Expand Up @@ -8533,10 +8551,13 @@ int BlueStore::_do_remove(
o->exists = false;
o->onode = bluestore_onode_t();
txc->removed(o);
string key;
for (auto &s : o->extent_map.shards) {
string key;
get_extent_shard_key(o->key, s.offset, &key);
txc->t->rmkey(PREFIX_OBJ, key);
generate_extent_shard_key_and_apply(o->key, s.offset, &key,
[&](const string& final_key) {
txc->t->rmkey(PREFIX_OBJ, final_key);
}
);
}
txc->t->rmkey(PREFIX_OBJ, o->key.c_str(), o->key.size());
o->extent_map.clear();
Expand Down Expand Up @@ -9076,13 +9097,18 @@ int BlueStore::_rename(TransContext *txc,
txc->t->rmkey(PREFIX_OBJ, oldo->key.c_str(), oldo->key.size());

// rewrite shards
oldo->extent_map.fault_range(db, 0, oldo->onode.size);
get_object_key(cct, new_oid, &new_okey);
for (auto &s : oldo->extent_map.shards) {
{
oldo->extent_map.fault_range(db, 0, oldo->onode.size);
get_object_key(cct, new_oid, &new_okey);
string key;
get_extent_shard_key(oldo->key, s.offset, &key);
txc->t->rmkey(PREFIX_OBJ, key);
s.dirty = true;
for (auto &s : oldo->extent_map.shards) {
generate_extent_shard_key_and_apply(oldo->key, s.offset, &key,
[&](const string& final_key) {
txc->t->rmkey(PREFIX_OBJ, final_key);
}
);
s.dirty = true;
Copy link
Contributor

Choose a reason for hiding this comment

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

I have a weak suspicious that there is no need to set dirty here as it indicates that shard encoding has changed. And that's not true here. @liewegas - am I right? Hence single enumeration function from the above comment might be a bit simpler - no need to have tricks for handling both Shard and dirty_shard_t types.

}
}

newo = oldo;
Expand Down
13 changes: 13 additions & 0 deletions src/os/kv.h
View file
Open in desktop
Expand Up @@ -21,6 +21,19 @@ inline static void _key_encode_u32(uint32_t u, T *key) {
key->append((char*)&bu, 4);
}

template<typename T>
inline static void _key_encode_u32(uint32_t u, size_t pos, T *key) {
uint32_t bu;
#ifdef CEPH_BIG_ENDIAN
bu = u;
#elif defined(CEPH_LITTLE_ENDIAN)
bu = swab32(u);
#else
# error wtf
#endif
key->replace(pos, sizeof(bu), (char*)&bu, sizeof(bu));
}

inline static const char *_key_decode_u32(const char *key, uint32_t *pu) {
uint32_t bu;
memcpy(&bu, key, 4);
Expand Down