]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PG::replica_scrub: don't adjust pool on max object
authorSamuel Just <sjust@redhat.com>
Fri, 3 Jun 2016 00:39:09 +0000 (17:39 -0700)
committerSamuel Just <sjust@redhat.com>
Mon, 6 Jun 2016 16:36:09 +0000 (09:36 -0700)
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 8b7b7c7a2379ce77173bbdfd90c98c561d786155)

src/osd/PG.cc

index e7e644298bd3e035a8ac67c9b4eff559912f3d0b..e06c560cabc29b4edbb9d293c474b87604ed1baa 100644 (file)
@@ -3899,8 +3899,10 @@ void PG::replica_scrub(
   // compensate for hobject_t's with wrong pool from sloppy hammer OSDs
   hobject_t start = msg->start;
   hobject_t end = msg->end;
-  start.pool = info.pgid.pool();
-  end.pool = info.pgid.pool();
+  if (!start.is_max())
+    start.pool = info.pgid.pool();
+  if (!end.is_max())
+    end.pool = info.pgid.pool();
 
   build_scrub_map_chunk(
     map, start, end, msg->deep, msg->seed,