From: Douglas Fuller <dfuller@redhat.com>
Date: Mon, 31 Jul 2017 13:33:42 +0000 (-0400)
Subject: cephfs: Wait for MDCache to be ready before starting log segment
X-Git-Tag: ses5-milestone10~3^2~20^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bffa375975ec0d1b2dbc01775a8a71e0357e2703;p=ceph.git

cephfs: Wait for MDCache to be ready before starting log segment

These can race as the MDS starts.

Fixes: http://tracker.ceph.com/issues/20799
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
---

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index d2501bbb56f..87956827774 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -1144,8 +1144,14 @@ void MDSRank::starting_done()
 
   mdcache->open_root();
 
-  // start new segment
-  mdlog->start_new_segment();
+  if (mdcache->is_open()) {
+    mdlog->start_new_segment();
+  } else {
+    mdcache->wait_for_open(new MDSInternalContextWrapper(this,
+			   new FunctionContext([this] (int r) {
+			       mdlog->start_new_segment();
+			   })));
+  }
 }