]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: do not activate agent unless base pool exists
authorSage Weil <sage@inktank.com>
Sat, 8 Feb 2014 02:03:41 +0000 (18:03 -0800)
committerSage Weil <sage@inktank.com>
Sun, 16 Feb 2014 06:09:39 +0000 (22:09 -0800)
Paranoia.

Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/ReplicatedPG.cc

index f166a99cedf27d9eea6eff7dfd33c78fed73958a..30ccea276b70448eddaf86fe27cb4a85082f4621 100644 (file)
@@ -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;
   }