From: Srivathsa Dara <srivathsa.d.dara@oracle.com>
To: mark@fasheh.com, jlbec@evilplan.org, joseph.qi@linux.alibaba.com
Cc: srivathsa.d.dara@oracle.com,
rajesh.sivaramasubramaniom@oracle.com, junxiao.bi@oracle.com,
ocfs2-devel@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH] ocfs2: call ocfs2_abort when journal abort
Date: Mon, 30 Oct 2023 12:00:57 +0000 [thread overview]
Message-ID: <20231030120057.928280-1-srivathsa.d.dara@oracle.com> (raw)
From: Ryan Ding <ryan.ding@oracle.com>
journal can not recover from abort state, so we should take following
action to prevent file system from corruption:
1. change to readonly filesystem when local mount. We can not afford
further write, so change to RO state is reasonable.
2. panic when cluster mount. Because we can not release lock resource in
this state, other node will hung when it require a lock owned by this
node. So panic and remaster is a reasonable choise.
ocfs2_abort() will do all the above work.
Signed-off-by: Ryan Ding <ryan.ding@oracle.com>
Signed-off-by: Srivathsa Dara <srivathsa.d.dara@oracle.com>
---
fs/ocfs2/journal.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index ce215565d061..6dace475f019 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -14,7 +14,6 @@
#include <linux/kthread.h>
#include <linux/time.h>
#include <linux/random.h>
-#include <linux/delay.h>
#include <linux/writeback.h>
#include <cluster/masklog.h>
@@ -2326,7 +2325,7 @@ static int __ocfs2_wait_on_mount(struct ocfs2_super *osb, int quota)
static int ocfs2_commit_thread(void *arg)
{
- int status;
+ int status = 0;
struct ocfs2_super *osb = arg;
struct ocfs2_journal *journal = osb->journal;
@@ -2340,21 +2339,25 @@ static int ocfs2_commit_thread(void *arg)
wait_event_interruptible(osb->checkpoint_event,
atomic_read(&journal->j_num_trans)
|| kthread_should_stop());
+ if (status < 0) {
+ /* As we can not terminate by ourself, just enter an
+ * empty loop to wait for stop.
+ */
+ continue;
+ }
status = ocfs2_commit_cache(osb);
if (status < 0) {
- static unsigned long abort_warn_time;
-
- /* Warn about this once per minute */
- if (printk_timed_ratelimit(&abort_warn_time, 60*HZ))
- mlog(ML_ERROR, "status = %d, journal is "
- "already aborted.\n", status);
/*
- * After ocfs2_commit_cache() fails, j_num_trans has a
- * non-zero value. Sleep here to avoid a busy-wait
- * loop.
+ * journal can not recover from abort state, there is
+ * no need to keep commit cache. So we should either
+ * change to readonly(local mount) or just panic
+ * (cluster mount).
+ * We should also clear j_num_trans to prevent further
+ * commit.
*/
- msleep_interruptible(1000);
+ atomic_set(&journal->j_num_trans, 0);
+ ocfs2_abort(osb->sb, "Detected aborted journal");
}
if (kthread_should_stop() && atomic_read(&journal->j_num_trans)){
--
2.39.3
next reply other threads:[~2023-10-30 12:01 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-30 12:00 Srivathsa Dara [this message]
2023-10-31 23:23 ` [PATCH] ocfs2: call ocfs2_abort when journal abort Anthony Iliopoulos
2023-11-09 19:26 ` Srivathsa Dara
2023-11-09 23:58 ` Anthony Iliopoulos
2023-11-21 12:19 ` Srivathsa Dara
2023-11-21 12:39 ` Anthony Iliopoulos
2023-11-01 1:13 ` Joseph Qi
2023-11-01 2:42 ` Heming Zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231030120057.928280-1-srivathsa.d.dara@oracle.com \
--to=srivathsa.d.dara@oracle.com \
--cc=jlbec@evilplan.org \
--cc=joseph.qi@linux.alibaba.com \
--cc=junxiao.bi@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mark@fasheh.com \
--cc=ocfs2-devel@lists.linux.dev \
--cc=rajesh.sivaramasubramaniom@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).