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

PG: ensure that info.last_epoch_started only increases

Browse Source 
See doc/dev/osd_internals/last_epoch_started.rst

Fixes: #11110
Signed-off-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Samuel Just 2015-03-18 12:11:07 -07:00
parent 2956ae278d
commit 0712d8d90b
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/osd/PG.cc
View File

@ -280,8 +280,12 @@ void PG::proc_master_log(
peer_info[from] = oinfo;
dout(10) << " peer osd." << from << " now " << oinfo << " " << omissing << dendl;
might_have_unfound.insert(from);
info.last_epoch_started = oinfo.last_epoch_started;
// See doc/dev/osd_internals/last_epoch_started
if (oinfo.last_epoch_started > info.last_epoch_started)
info.last_epoch_started = oinfo.last_epoch_started;
info.history.merge(oinfo.history);
assert(info.last_epoch_started >= info.history.last_epoch_started);
peer_missing[from].swap(omissing);
}
@ -1480,11 +1484,17 @@ void PG::activate(ObjectStore::Transaction& t,
if (is_primary()) {
// only update primary last_epoch_started if we will go active
if (acting.size() >= pool.info.min_size)
if (acting.size() >= pool.info.min_size) {
assert(cct->_conf->osd_find_best_info_ignore_history_les ||
info.last_epoch_started <= activation_epoch);
info.last_epoch_started = activation_epoch;
}
} else if (is_acting(pg_whoami)) {
// update last_epoch_started on acting replica to whatever the primary sent
info.last_epoch_started = activation_epoch;
/* update last_epoch_started on acting replica to whatever the primary sent
* unless it's smaller (could happen if we are going peered rather than
* active, see doc/dev/osd_internals/last_epoch_started.rst) */
if (info.last_epoch_started < activation_epoch)
info.last_epoch_started = activation_epoch;
}
const pg_missing_t &missing = pg_log.get_missing();