summaryrefslogtreecommitdiffstats
path: root/src/mds/MDLog.cc
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-23 16:45:17 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-23 16:45:44 +0000
commit17d6a993fc17d533460c5f40f3908c708e057c18 (patch)
tree1a3bd93e0ecd74fa02f93a528fe2f87e5314c4b5 /src/mds/MDLog.cc
parentReleasing progress-linux version 18.2.2-0progress7.99u1. (diff)
downloadceph-17d6a993fc17d533460c5f40f3908c708e057c18.tar.xz
ceph-17d6a993fc17d533460c5f40f3908c708e057c18.zip
Merging upstream version 18.2.3.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/mds/MDLog.cc')
-rw-r--r--src/mds/MDLog.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 82899d2da..840a43733 100644
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -1364,11 +1364,10 @@ void MDLog::_replay_thread()
break;
}
- if (!journaler->is_readable() &&
- journaler->get_read_pos() == journaler->get_write_pos())
+ if (journaler->get_read_pos() == journaler->get_write_pos()) {
+ dout(10) << "_replay: read_pos == write_pos" << dendl;
break;
-
- ceph_assert(journaler->is_readable() || mds->is_daemon_stopping());
+ }
// read it
uint64_t pos = journaler->get_read_pos();