From: Sage Weil <sage@inktank.com>
Date: Mon, 27 Jan 2014 23:34:50 +0000 (-0800)
Subject: osd: only enable tier agent when osd is in active state
X-Git-Tag: v0.78~166^2~23
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7bb0aa5a070bcb1c822dec5c8ea54638937b6e2a;p=ceph.git

osd: only enable tier agent when osd is in active state

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

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a5e29ce21229..0ca4ca141996 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -455,7 +455,9 @@ void OSDService::activate_map()
 {
   // wake/unwake the tiering agent
   agent_lock.Lock();
-  agent_active = !osdmap->test_flag(CEPH_OSDMAP_NOTIERAGENT);
+  agent_active =
+    !osdmap->test_flag(CEPH_OSDMAP_NOTIERAGENT) &&
+    osd->is_active();
   agent_cond.Signal();
   agent_lock.Unlock();
 }