]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: update export targets even when not active
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 9 May 2017 02:26:48 +0000 (22:26 -0400)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 9 May 2017 02:55:56 +0000 (22:55 -0400)
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>
src/mds/MDSRank.cc

index 4d0dc1c0c5ba6af211355716677b1e9afd0082e8..a5d2de61a409dfdff7d8be72ae6fb9b009316a0c 100644 (file)
@@ -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();