From: Yan, Zheng <zyan@redhat.com>
Date: Sun, 7 Jun 2015 02:47:47 +0000 (+0800)
Subject: mds: re-issue caps when recovering MDS becomes active
X-Git-Tag: v9.1.0~57^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=976b449b7baecea32e889cdcd215e642ca619c2a;p=ceph.git

mds: re-issue caps when recovering MDS becomes active

this makes sure the recovering MDS handle cap flushes re-sent by
clients before re-issuing caps.

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index dc550989e286..ac07b1651273 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -1254,6 +1254,9 @@ void MDSRank::active_start()
   mdcache->clean_open_file_lists();
   mdcache->export_remaining_imported_caps();
   finish_contexts(g_ceph_context, waiting_for_replay);  // kick waiters
+
+  mdcache->reissue_all_caps();
+
   finish_contexts(g_ceph_context, waiting_for_active);  // kick waiters
 }
 
@@ -1275,8 +1278,6 @@ void MDSRank::recovery_done(int oldstate)
   mdcache->start_recovered_truncates();
   mdcache->do_file_recover();
 
-  mdcache->reissue_all_caps();
-  
   // tell connected clients
   //bcast_mds_map();     // not anymore, they get this from the monitor