]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: fix MDLog error handling on ENOENT
authorJohn Spray <john.spray@redhat.com>
Wed, 20 May 2015 15:40:04 +0000 (16:40 +0100)
committerJohn Spray <john.spray@redhat.com>
Thu, 18 Jun 2015 10:19:44 +0000 (11:19 +0100)
This was trying to check for standby replay
by testing is_readonly(), but that's always
true during normal replay.  Check mds->is_standby_replay()
instead.

Signed-off-by: John Spray <john.spray@redhat.com>
src/mds/MDLog.cc

index 4c22e7e4a92aacdde1ecc47459acb0fad670fc1d..4ee502ee1a80f9b52000a8bcc0688fdf4964d7d1 100644 (file)
@@ -1145,7 +1145,7 @@ void MDLog::_replay_thread()
       r = journaler->get_error();
       dout(0) << "_replay journaler got error " << r << ", aborting" << dendl;
       if (r == -ENOENT) {
-        if (journaler->is_readonly()) {
+        if (mds->is_standby_replay()) {
           // journal has been trimmed by somebody else
           r = -EAGAIN;
         } else {