From 976b449b7baecea32e889cdcd215e642ca619c2a Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Sun, 7 Jun 2015 10:47:47 +0800 Subject: [PATCH] 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 --- src/mds/MDSRank.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index dc550989e28..ac07b165127 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 -- 2.47.3