From: Sage Weil <sage@redhat.com>
Date: Fri, 10 Feb 2017 04:02:05 +0000 (-0500)
Subject: osdc/Objecter: use overlay pg_pool_t for subsequent calculations
X-Git-Tag: v12.0.1~383^2~8
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a7dc052f9ed4b06335610b54f8991ee84a65170e;p=ceph-ci.git

osdc/Objecter: use overlay pg_pool_t for subsequent calculations

We use pi for pg_num and other values below; we need to update accordingly
if we follow the overlay.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index a495ed99017..2567b990894 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -2694,6 +2694,11 @@ int Objecter::_calc_target(op_target_t *t, Connection *con, bool any_change)
       t->target_oloc.pool = pi->read_tier;
     if (is_write && pi->has_write_tier())
       t->target_oloc.pool = pi->write_tier;
+    pi = osdmap->get_pg_pool(t->target_oloc.pool);
+    if (!pi) {
+      t->osd = -1;
+      return RECALC_OP_TARGET_POOL_DNE;
+    }
   }
 
   pg_t pgid;