RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 06:52:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd/PGLog.cc: check if complete_to points to log.end()

Browse Source 
Signed-off-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
Neha Ojha 2018-08-03 17:38:22 -07:00
parent ef6e10501a
commit 630daa1d7d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osd/PGLog.cc
View File

@ -51,7 +51,8 @@ void PGLog::IndexedLog::trim(
eversion_t *write_from_dups)
{
assert(s <= can_rollback_to);
lgeneric_subdout(cct, osd, 20) << " complete_to " << complete_to->version << dendl;
if (complete_to != log.end())
lgeneric_subdout(cct, osd, 20) << " complete_to " << complete_to->version << dendl;
auto earliest_dup_version =
log.rbegin()->version.version < cct->_conf->osd_pg_log_dups_tracked
@ -87,7 +88,7 @@ void PGLog::IndexedLog::trim(
bool reset_complete_to = false;
// we are trimming past complete_to, so reset complete_to
if (e.version >= complete_to->version)
if (complete_to != log.end() && e.version >= complete_to->version)
reset_complete_to = true;
if (rollback_info_trimmed_to_riter == log.rend() ||
e.version == rollback_info_trimmed_to_riter->version) {
@ -181,7 +182,8 @@ void PGLog::trim(
dout(10) << "trim " << log << " to " << trim_to << dendl;
log.trim(cct, trim_to, &trimmed, &trimmed_dups, &write_from_dups);
info.log_tail = log.tail;
dout(10) << " after trim complete_to " << log.complete_to->version << dendl;
if (log.complete_to != log.log.end())
dout(10) << " after trim complete_to " << log.complete_to->version << dendl;
}
}