From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Fri, 21 Jan 2011 19:07:52 +0000 (-0800)
Subject: mds: Keep journaler in readonly mode until replay completes.
X-Git-Tag: v0.25~251^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b60223adb09e3f5ca6ea62fd7604f4957584dc1;p=ceph.git

mds: Keep journaler in readonly mode until replay completes.

Previously we were switching it off for the final non-standby replay
when a standby-replay got activated. This caused issues
since the states weren't quite correct!

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc
index 79372a6a2bc6..21d7ff74d2b8 100644
--- a/src/mds/MDS.cc
+++ b/src/mds/MDS.cc
@@ -1272,12 +1272,13 @@ void MDS::replay_done()
   }
 
   if (continue_replay) {
-    mdlog->get_journaler()->set_writeable();
     continue_replay = false;
     standby_replay_restart();
     return;
   }
 
+  mdlog->get_journaler()->set_writeable();
+
   if (g_conf.mds_wipe_sessions) {
     dout(1) << "wiping out client sessions" << dendl;
     sessionmap.wipe();