From: Zac Dover <zac.dover@proton.me>
Date: Mon, 18 Aug 2025 06:48:07 +0000 (+1000)
Subject: Merge branch 'squid' into wip-doc-2025-08-14-backport-64922-to-squid
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F65036%2Fhead;p=ceph.git

Merge branch 'squid' into wip-doc-2025-08-14-backport-64922-to-squid

Signed-off-by: Zac Dover <zac.dover@proton.me>
---

8eda173856f652b6c37da1d20c6019122c7a387c
diff --cc doc/cephfs/troubleshooting.rst
index e8fbb2d3a6c,bc4e2506f44..41006ddacd9
--- a/doc/cephfs/troubleshooting.rst
+++ b/doc/cephfs/troubleshooting.rst
@@@ -86,8 -88,22 +88,24 @@@ Replay completes when the ``journal_rea
  ``journal_write_pos``. The write position does not change during replay. Track
  the progression of the read position to compute the expected time to complete.
  
+ .. In Tentacle and later releases, the following text appears. It should not be
+    backported to any branch prior to Tentacle, because the
+    ``MDS_ESTIMATED_REPLAY_TIME`` warning was never a backport candidate for the
+    Squid and the Reef release branches. See
+    https://github.com/ceph/ceph/pull/65058#discussion_r2281247895. Here is the
+    text that should not be backported:
+ 
+    BEGIN QUOTED TEXT
+    The MDS emits an `MDS_ESTIMATED_REPLAY_TIME` warning when the act of
+    replaying the journal takes more than 30 seconds. The warning message
+    includes an estimated time to the completion of journal replay::
+ 
+   mds.a(mds.0): replay: 50.0446% complete - elapsed time: 582s, estimated time remaining: 581s
+ 
+    END QUOTED TEXT
+ 
 +.. _cephfs_troubleshooting_avoiding_recovery_roadblocks:
 +
  Avoiding recovery roadblocks
  ----------------------------