From 17d6a993fc17d533460c5f40f3908c708e057c18 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 23 May 2024 18:45:17 +0200 Subject: Merging upstream version 18.2.3. Signed-off-by: Daniel Baumann --- src/mds/MDLog.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/mds/MDLog.cc') 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(); -- cgit v1.2.3