From: Sage Weil <sage@inktank.com>
Date: Sat, 8 Feb 2014 02:03:41 +0000 (-0800)
Subject: osd/ReplicatedPG: do not activate agent unless base pool exists
X-Git-Tag: v0.78~166^2~11
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8c7bc2e873deb09e8a5e6bab1e62ee9fb19cf025;p=ceph.git

osd/ReplicatedPG: do not activate agent unless base pool exists

Paranoia.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index f166a99cedf27..30ccea276b704 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -10186,7 +10186,9 @@ void ReplicatedPG::agent_setup()
 {
   assert(is_locked());
   if (!is_primary() ||
-      pool.info.cache_mode == pg_pool_t::CACHEMODE_NONE) {
+      pool.info.cache_mode == pg_pool_t::CACHEMODE_NONE ||
+      pool.info.tier_of < 0 ||
+      !get_osdmap()->have_pg_pool(pool.info.tier_of)) {
     agent_clear();
     return;
   }