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: clear omap flag if parent has none #12351

Merged
merged 2 commits into from Dec 16, 2016
Merged

os/bluestore: clear omap flag if parent has none #12351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
411b732
os/bluestore: clear omap flag if parent has none
xiexingguo Dec 7, 2016
ba6a43a
os/bluestore: cleanup Cache::_audit
xiexingguo Dec 7, 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
92 changes: 45 additions & 47 deletions src/os/bluestore/BlueStore.cc
View file
Open in desktop
Expand Up @@ -646,23 +646,21 @@ void BlueStore::LRUCache::_trim(uint64_t onode_max, uint64_t buffer_max)
#ifdef DEBUG_CACHE
void BlueStore::LRUCache::_audit(const char *when)
{
if (true) {
dout(10) << __func__ << " " << when << " start" << dendl;
uint64_t s = 0;
dout(10) << __func__ << " " << when << " start" << dendl;
uint64_t s = 0;
for (auto i = buffer_lru.begin(); i != buffer_lru.end(); ++i) {
s += i->length;
}
if (s != buffer_size) {
derr << __func__ << " buffer_size " << buffer_size << " actual " << s
<< dendl;
for (auto i = buffer_lru.begin(); i != buffer_lru.end(); ++i) {
s += i->length;
derr << __func__ << " " << *i << dendl;
}
if (s != buffer_size) {
derr << __func__ << " buffer_size " << buffer_size << " actual " << s
<< dendl;
for (auto i = buffer_lru.begin(); i != buffer_lru.end(); ++i) {
derr << __func__ << " " << *i << dendl;
}
assert(s == buffer_size);
}
dout(20) << __func__ << " " << when << " buffer_size " << buffer_size
<< " ok" << dendl;
assert(s == buffer_size);
}
dout(20) << __func__ << " " << when << " buffer_size " << buffer_size
<< " ok" << dendl;
}
#endif

Expand Down Expand Up @@ -901,44 +899,42 @@ void BlueStore::TwoQCache::_trim(uint64_t onode_max, uint64_t buffer_max)
#ifdef DEBUG_CACHE
void BlueStore::TwoQCache::_audit(const char *when)
{
if (true) {
dout(10) << __func__ << " " << when << " start" << dendl;
uint64_t s = 0;
for (auto i = buffer_hot.begin(); i != buffer_hot.end(); ++i) {
s += i->length;
}

uint64_t hot_bytes = s;
if (hot_bytes != buffer_list_bytes[BUFFER_HOT]) {
derr << __func__ << " hot_list_bytes "
<< buffer_list_bytes[BUFFER_HOT]
<< " != actual " << hot_bytes
<< dendl;
assert(hot_bytes == buffer_list_bytes[BUFFER_HOT]);
}
dout(10) << __func__ << " " << when << " start" << dendl;
uint64_t s = 0;
for (auto i = buffer_hot.begin(); i != buffer_hot.end(); ++i) {
s += i->length;
}

for (auto i = buffer_warm_in.begin(); i != buffer_warm_in.end(); ++i) {
s += i->length;
}
uint64_t hot_bytes = s;
if (hot_bytes != buffer_list_bytes[BUFFER_HOT]) {
derr << __func__ << " hot_list_bytes "
<< buffer_list_bytes[BUFFER_HOT]
<< " != actual " << hot_bytes
<< dendl;
assert(hot_bytes == buffer_list_bytes[BUFFER_HOT]);
}

uint64_t warm_in_bytes = s - hot_bytes;
if (warm_in_bytes != buffer_list_bytes[BUFFER_WARM_IN]) {
derr << __func__ << " warm_in_list_bytes "
<< buffer_list_bytes[BUFFER_WARM_IN]
<< " != actual " << warm_in_bytes
<< dendl;
assert(warm_in_bytes == buffer_list_bytes[BUFFER_WARM_IN]);
}
for (auto i = buffer_warm_in.begin(); i != buffer_warm_in.end(); ++i) {
s += i->length;
}

if (s != buffer_bytes) {
derr << __func__ << " buffer_bytes " << buffer_bytes << " actual " << s
<< dendl;
assert(s == buffer_bytes);
}
uint64_t warm_in_bytes = s - hot_bytes;
if (warm_in_bytes != buffer_list_bytes[BUFFER_WARM_IN]) {
derr << __func__ << " warm_in_list_bytes "
<< buffer_list_bytes[BUFFER_WARM_IN]
<< " != actual " << warm_in_bytes
<< dendl;
assert(warm_in_bytes == buffer_list_bytes[BUFFER_WARM_IN]);
}

dout(20) << __func__ << " " << when << " buffer_bytes " << buffer_bytes
<< " ok" << dendl;
if (s != buffer_bytes) {
derr << __func__ << " buffer_bytes " << buffer_bytes << " actual " << s
<< dendl;
assert(s == buffer_bytes);
}

dout(20) << __func__ << " " << when << " buffer_bytes " << buffer_bytes
<< " ok" << dendl;
}
#endif

Expand Down Expand Up @@ -8587,6 +8583,8 @@ int BlueStore::_clone(TransContext *txc,
}
it->next();
}
} else {
newo->onode.clear_omap_flag();
}

txc->write_onode(newo);
Expand Down