diff options
| author | Samuel Just <sam.just@inktank.com> | 2013-07-22 13:46:10 -0700 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2013-07-22 15:06:02 -0700 |
| commit | 6957dbc75cc2577652b542aa3eae69f03060cb63 (patch) | |
| tree | 5f93657d90dfb3fb8afa9f15ff86f992e5dc03aa | |
| parent | 046d5cb6db99e4cf38e870a5de487eadd856ebda (diff) | |
| download | ceph-6957dbc75cc2577652b542aa3eae69f03060cb63.tar.gz | |
PGLog::rewind_divergent_log: unindex only works from tail, index() instead
Fixes: #5714
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/osd/PGLog.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc index 6ba08362dad..2f2c83757db 100644 --- a/src/osd/PGLog.cc +++ b/src/osd/PGLog.cc @@ -375,7 +375,6 @@ void PGLog::rewind_divergent_log(ObjectStore::Transaction& t, eversion_t newhead } assert(p->version > newhead); dout(10) << "rewind_divergent_log future divergent " << *p << dendl; - log.unindex(*p); } log.head = newhead; @@ -383,6 +382,7 @@ void PGLog::rewind_divergent_log(ObjectStore::Transaction& t, eversion_t newhead if (info.last_complete > newhead) info.last_complete = newhead; + log.index(); for (list<pg_log_entry_t>::iterator d = divergent.begin(); d != divergent.end(); ++d) merge_old_entry(t, *d, info, remove_snap); |