From: Patrick Donnelly <pdonnell@redhat.com>
Date: Tue, 9 May 2017 02:26:48 +0000 (-0400)
Subject: mds: update export targets even when not active
X-Git-Tag: v12.0.3~38^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=88e6db1f2577a7f62fa946d75e12f992e92f5c78;p=ceph.git

mds: update export targets even when not active

Problem caught test_migration_on_shutdown. Migration could not proceed because
export_targets were not being updated.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 4d0dc1c0c5ba..a5d2de61a409 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -284,13 +284,16 @@ void MDSRankDispatcher::tick()
 
   if (is_active()) {
     balancer->tick();
-    update_targets(ceph_clock_now());
     mdcache->find_stale_fragment_freeze();
     mdcache->migrator->find_stale_export_freeze();
     if (snapserver)
       snapserver->check_osd_map(false);
   }
 
+  if (is_active() || is_stopping()) {
+    update_targets(ceph_clock_now());
+  }
+
   // shut down?
   if (is_stopping()) {
     mdlog->trim();