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

osd/PrimaryLogPG: do not use approx_size() for log trimming

Browse Source 
There might be holes on log versions, thus the approx_size()
should (almost) always overestimate the actual number of log entries.
As a result, we might be at the risk of accessing violation
while searching for the oldest log entry to keep in the log list later.

Fix the above problem by counting the precise number of current
log entries instead.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
This commit is contained in:
xie xingguo 2017-10-17 09:55:57 +08:00
parent 3455a38f73
commit 024b5bcbf0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/osd/PrimaryLogPG.cc
View File

@ -1539,10 +1539,11 @@ void PrimaryLogPG::calc_trim_to()
eversion_t limit = MIN(
min_last_complete_ondisk,
pg_log.get_can_rollback_to());
size_t log_size = pg_log.get_log().log.size();
if (limit != eversion_t() &&
limit != pg_trim_to &&
pg_log.get_log().approx_size() > target) {
size_t num_to_trim = pg_log.get_log().approx_size() - target;
log_size > target) {
size_t num_to_trim = log_size - target;
if (num_to_trim < cct->_conf->osd_pg_log_trim_min) {
return;
}