From: Sage Weil Date: Tue, 19 Feb 2019 15:33:27 +0000 (-0600) Subject: osd/PG: fix comments in merge_from X-Git-Tag: v14.1.0~31^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26513%2Fhead;p=ceph.git osd/PG: fix comments in merge_from Some of these were stale. Signed-off-by: Sage Weil --- diff --git a/src/osd/PG.cc b/src/osd/PG.cc index b2e1b89dec5f..124e6b9faf31 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -2779,13 +2779,10 @@ void PG::merge_from(map& sources, RecoveryCtx *rctx, // remapped in concert with each other... info.history = sources.begin()->second->info.history; - // we use the pg_num_dec_last_epoch_clean we got from the caller, which is - // the epoch that was clean according to the target pg whe it requested - // the mon decrement pg_num. + // we use the pg_num_dec_last_epoch_{started,clean} we got from + // the caller, which are the epochs that were reported by the PGs were + // found to be ready for merge. info.history.last_epoch_clean = dec_last_epoch_clean; - - // use last_epoch_clean value for last_epoch_started, though--we must be - // conservative here to avoid breaking peering, calc_acting, etc. info.history.last_epoch_started = dec_last_epoch_started; info.last_epoch_started = dec_last_epoch_started; dout(10) << __func__