RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-30 15:31:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9516 from liewegas/wip-bluestore-fixes

Browse Source 
os/bluestore: misc fixes

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-06-06 09:26:56 -04:00
commit 3e6c951f68
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2629,7 +2629,7 @@ int BlueStore::fsck()
ghobject_t oid;
if (is_bnode_key(it->key())) {
if (expecting_objects) {
dout(30) << __func__ << " had bnode but no objects for "
dout(30) << __func__ << " had bnode but no objects for 0x"
<< std::hex << expecting_hash << std::dec << dendl;
++errors;
}
@ -2646,7 +2646,7 @@ int BlueStore::fsck()
}
if (expecting_objects) {
if (oid.hobj.get_bitwise_key_u32() != expecting_hash) {
dout(30) << __func__ << " had bnode but no objects for "
dout(30) << __func__ << " had bnode but no objects for 0x"
<< std::hex << expecting_hash << std::dec << dendl;
++errors;
}
@ -2672,7 +2672,7 @@ int BlueStore::fsck()
}
}
if (expecting_objects) {
dout(30) << __func__ << " had bnode but no objects for "
dout(30) << __func__ << " had bnode but no objects for 0x"
<< std::hex << expecting_hash << std::dec << dendl;
++errors;
expecting_objects = false;

8
src/os/bluestore/bluestore_types.cc
View File

@ -104,9 +104,7 @@ string bluestore_extent_t::get_flags_string(unsigned flags)
{
string s;
if (flags & FLAG_SHARED) {
if (s.length())
s += '+';
s += "shared";
s = "shared";
}
return s;
}
@ -438,9 +436,7 @@ string bluestore_blob_t::get_flags_string(unsigned flags)
{
string s;
if (flags & FLAG_MUTABLE) {
if (s.length())
s += '+';
s += "mutable";
s = "mutable";
}
if (flags & FLAG_COMPRESSED) {
if (s.length())

1
src/os/bluestore/bluestore_types.h
View File

@ -337,6 +337,7 @@ struct bluestore_blob_t {
return true;
}
b_len -= p->length;
++p;
}
assert(0 == "we should not get here");
}