From: Samuel Just <sjust@redhat.com>
Date: Fri, 3 Jun 2016 00:39:09 +0000 (-0700)
Subject: PG::replica_scrub: don't adjust pool on max object
X-Git-Tag: v11.0.0~296^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b7b7c7a2379ce77173bbdfd90c98c561d786155;p=ceph.git

PG::replica_scrub: don't adjust pool on max object

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 34d21c7b7524..426a0f410446 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3864,8 +3864,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,