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 <sage.weil@dreamhost.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 112f7eaa1587dfc8185b27cdb02124446f3fef09..f47d27719eda946ca80f3aaf8a1bb055460ca779 100644 (file)
--- 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, &notify_list, 0, 0);