From db5ed8ed4afbbb3ca5bc8a2a8103cd51ddd0a51e Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 25 Jan 2017 17:15:56 -0800 Subject: [PATCH] OSD: update OSD backfill discussion comments Signed-off-by: Greg Farnum --- src/osd/PrimaryLogPG.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 496947000bc..9d6ed510986 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -10912,8 +10912,8 @@ bool PrimaryLogPG::all_peer_done() const * our copy and theirs). * * All objects on a backfill_target in - * [MIN,peer_backfill_info[backfill_target].begin) are either - * not present or backfilled (all removed objects have been removed). + * [MIN,peer_backfill_info[backfill_target].begin) are valid; logically-removed + * objects have been actually deleted and all logically-valid objects are replicated. * There may be PG objects in this interval yet to be backfilled. * * All objects in PG in [MIN,backfill_info.begin) have been backfilled to all @@ -10926,7 +10926,7 @@ bool PrimaryLogPG::all_peer_done() const * For a backfill target, all objects <= peer_info[target].last_backfill * have been backfilled to target * - * There *MAY* be objects between last_backfill_started and + * There *MAY* be missing/outdated objects between last_backfill_started and * MIN(peer_backfill_info[*].begin, backfill_info.begin) in the event that client * io created objects since the last scan. For this reason, we call * update_range() again before continuing backfill. @@ -11115,10 +11115,10 @@ uint64_t PrimaryLogPG::recover_backfill( * by just not updating last_backfill_started here if head doesn't * exist and snapdir does. We aren't using up a recovery count here, * so we're going to recover snapdir immediately anyway. We'll only - * fail if we fail to get the rw lock (which I believe is why this - * failure mode is so rare). + * fail "backward" if we fail to get the rw lock and that just means + * we'll re-process this section of the hash space again. * - * I'm choosing a hack here because the really "correct" answer is + * I'm choosing this hack here because the really "correct" answer is * going to be to unify snapdir and head into a single object (a * snapdir is really just a confusing way to talk about head existing * as a whiteout), but doing that is going to be a somewhat larger -- 2.47.3