From fc8ce16a84aeb0026399d51a5ab8f7f184f67a8b Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 28 Apr 2012 22:32:08 -0700 Subject: [PATCH] osd: do not merge history on query We shouldn't modify the local notion of the history without recording it to disk. And we (probably) also don't need to do that at all on query. Signed-off-by: Sage Weil --- src/osd/OSD.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 112f7eaa1587d..f47d27719eda9 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -4634,9 +4634,11 @@ void OSD::handle_pg_query(OpRequestRef op) continue; } + /* FIXME: do not do this unless/until we also write any modified history to disk. unreg_last_pg_scrub(pg->info.pgid, pg->info.history.last_scrub_stamp); pg->info.history.merge(it->second.history); reg_last_pg_scrub(pg->info.pgid, pg->info.history.last_scrub_stamp); + */ // ok, process query! PG::RecoveryCtx rctx(0, 0, ¬ify_list, 0, 0); -- 2.39.5