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.

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

os/bluestore: fix potential assert in cache _trim method. #13234

Merged
merged 1 commit into from Feb 2, 2017
Merged
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion src/os/bluestore/BlueStore.cc
Expand Up @@ -680,6 +680,7 @@ void BlueStore::LRUCache::_trim(uint64_t onode_max, uint64_t buffer_max)
break;
} else {
p--;
num--;
continue;
}
}
Expand Down Expand Up @@ -946,10 +947,11 @@ void BlueStore::TwoQCache::_trim(uint64_t onode_max, uint64_t buffer_max)
break;
} else {
p--;
num--;
continue;
}
}
dout(30) << __func__ << " trim " << o->oid << dendl;
dout(30) << __func__ << " " << o->oid << " num=" << num <<" lru size="<<onode_lru.size()<< dendl;
if (p != onode_lru.begin()) {
onode_lru.erase(p--);
} else {
Expand Down