]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: only enable tier agent when osd is in active state
authorSage Weil <sage@inktank.com>
Mon, 27 Jan 2014 23:34:50 +0000 (15:34 -0800)
committerSage Weil <sage@inktank.com>
Sun, 16 Feb 2014 06:09:38 +0000 (22:09 -0800)
Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/OSD.cc

index a5e29ce212290dfbc8d35820f6351666b85678d9..0ca4ca141996431e54975331b46062c35db801f9 100644 (file)
@@ -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();
 }