From patchwork Thu Dec 12 06:00:00 2019
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Likai
X-Patchwork-Id: 11287101
Return-Path:
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
[172.30.200.123])
by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8753114B7
for ;
Thu, 12 Dec 2019 06:05:36 +0000 (UTC)
Received: from userp2120.oracle.com (userp2120.oracle.com [156.151.31.85])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mail.kernel.org (Postfix) with ESMTPS id 289952073D
for ;
Thu, 12 Dec 2019 06:05:35 +0000 (UTC)
DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 289952073D
Authentication-Results: mail.kernel.org;
dmarc=none (p=none dis=none) header.from=h3c.com
Authentication-Results: mail.kernel.org;
spf=pass smtp.mailfrom=ocfs2-devel-bounces@oss.oracle.com
Received: from pps.filterd (userp2120.oracle.com [127.0.0.1])
by userp2120.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xBC6506t012099;
Thu, 12 Dec 2019 06:05:22 GMT
Received: from userp3030.oracle.com (userp3030.oracle.com [156.151.31.80])
by userp2120.oracle.com with ESMTP id 2wr4qrrspq-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK);
Thu, 12 Dec 2019 06:05:22 +0000
Received: from pps.filterd (userp3030.oracle.com [127.0.0.1])
by userp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id xBC60Zvj106813;
Thu, 12 Dec 2019 06:05:21 GMT
Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2])
by userp3030.oracle.com with ESMTP id 2wu3k0h26x-1
(version=TLSv1 cipher=AES256-SHA bits=256 verify=NO);
Thu, 12 Dec 2019 06:05:21 +0000
Received: from localhost ([127.0.0.1] helo=lb-oss.oracle.com)
by oss.oracle.com with esmtp (Exim 4.63)
(envelope-from )
id 1ifHYA-00078S-VX; Wed, 11 Dec 2019 22:02:10 -0800
Received: from aserp3020.oracle.com ([141.146.126.70])
by oss.oracle.com with esmtp (Exim 4.63)
(envelope-from ) id 1ifHXp-00077f-FS
for ocfs2-devel@oss.oracle.com; Wed, 11 Dec 2019 22:01:49 -0800
Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1])
by aserp3020.oracle.com (8.16.0.27/8.16.0.27) with SMTP id
xBC5xx2p084771
for ; Thu, 12 Dec 2019 06:01:49 GMT
Received: from userp2030.oracle.com (userp2030.oracle.com [156.151.31.89])
by aserp3020.oracle.com with ESMTP id 2wubmdg81q-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK)
for ; Thu, 12 Dec 2019 06:01:48 +0000
Received: from pps.filterd (userp2030.oracle.com [127.0.0.1])
by userp2030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id
xBC61ELm012926
for ; Thu, 12 Dec 2019 06:01:48 GMT
Received: from h3cspam02-ex.h3c.com (smtp.h3c.com [60.191.123.50])
by userp2030.oracle.com with ESMTP id 2wuf0j0mfy-1
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256
verify=FAIL)
for ; Thu, 12 Dec 2019 06:01:46 +0000
Received: from DAG2EX10-IDC.srv.huawei-3com.com ([10.8.0.73])
by h3cspam02-ex.h3c.com with ESMTPS id xBC60hJq043933
(version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL);
Thu, 12 Dec 2019 14:00:43 +0800 (GMT-8)
(envelope-from li.kai4@h3c.com)
Received: from DAG2EX10-IDC.srv.huawei-3com.com (10.8.0.73) by
DAG2EX10-IDC.srv.huawei-3com.com (10.8.0.73) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.1.1713.5; Thu, 12 Dec 2019 14:00:45 +0800
Received: from BJHUB01-EX.srv.huawei-3com.com (10.63.20.169) by
DAG2EX10-IDC.srv.huawei-3com.com (10.8.0.73) with Microsoft SMTP Server
(version=TLS1_0,
cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.1.1713.5
via Frontend Transport; Thu, 12 Dec 2019 14:00:45 +0800
Received: from RDVDI-L14391V.h3c.huawei-3com.com (10.125.108.72) by
rndsmtp.h3c.com (10.63.20.174) with Microsoft SMTP Server id 14.3.408.0;
Thu, 12 Dec 2019 14:00:36 +0800
From: Kai Li
To: , , ,
Date: Thu, 12 Dec 2019 14:00:00 +0800
Message-ID: <20191212060000.930-1-li.kai4@h3c.com>
X-Mailer: git-send-email 2.24.0.windows.2
MIME-Version: 1.0
X-Originating-IP: [10.125.108.72]
X-DNSRBL:
X-MAIL: h3cspam02-ex.h3c.com xBC60hJq043933
X-PDR: PASS
X-Source-IP: 60.191.123.50
X-ServerName: smtp.h3c.com
X-Proofpoint-SPF-Result: pass
X-Proofpoint-SPF-Record: v=spf1 ip4:60.191.123.56 ip4:60.191.123.50
ip4:221.12.31.13
ip4:221.12.31.56 ip4:122.225.128.134 -all
X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9468
signatures=668685
X-Proofpoint-Spam-Details: rule=tap_spam_policies_notspam
policy=tap_spam_policies score=0
priorityscore=130 malwarescore=0 suspectscore=8 phishscore=0
bulkscore=0
spamscore=0 clxscore=284 lowpriorityscore=0 mlxscore=0 impostorscore=0
mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx
scancount=1 engine=8.0.1-1911140001 definitions=main-1912120038
X-Spam: Clean
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=8
malwarescore=0
phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999
adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
engine=8.0.1-1911140001 definitions=main-1912120038
Cc: linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH v2] ocfs2: call journal flush to mark journal
as empty after journal recovery when mount
X-BeenThere: ocfs2-devel@oss.oracle.com
X-Mailman-Version: 2.1.9
Precedence: list
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
Sender: ocfs2-devel-bounces@oss.oracle.com
Errors-To: ocfs2-devel-bounces@oss.oracle.com
X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9468
signatures=668685
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0
malwarescore=0
phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999
adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1
engine=8.0.1-1911140001 definitions=main-1912120038
X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9468
signatures=668685
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0
priorityscore=1501 malwarescore=0
suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015
lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0
classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1911140001
definitions=main-1912120039
If journal is dirty when mount, it will be replayed but jbd2 sb
log tail cannot be updated to mark a new start because
journal->j_flag has already been set with JBD2_ABORT first
in journal_init_common. When a new transaction is committed, it
will be recored in block 1 first(journal->j_tail is set to 1 in
journal_reset).If emergency restart happens again before journal
super block is updated unfortunately, the new recorded trans will
not be replayed in the next mount.
The following steps describe this procedure in detail.
1. mount and touch some files
2. these transactions are committed to journal area but not checkpointed
3. emergency restart
4. mount again and its journals are replayed
5. journal super block's first s_start is 1, but its s_seq is not updated
6. touch a new file and its trans is committed but not checkpointed
7. emergency restart again
8. mount and journal is dirty, but trans committed in 6 will not be
replayed.
This exception happens easily when this lun is used by only one node. If it
is used by multi-nodes, other node will replay its journal and its
journal super block will be updated after recovery like what this patch
does.
ocfs2_recover_node->ocfs2_replay_journal.
The following jbd2 journal can be generated by touching a new file after
journal is replayed, and seq 15 is the first valid commit, but first seq
is 13 in journal super block.
logdump:
Block 0: Journal Superblock
Seq: 0 Type: 4 (JBD2_SUPERBLOCK_V2)
Blocksize: 4096 Total Blocks: 32768 First Block: 1
First Commit ID: 13 Start Log Blknum: 1
Error: 0
Feature Compat: 0
Feature Incompat: 2 block64
Feature RO compat: 0
Journal UUID: 4ED3822C54294467A4F8E87D2BA4BC36
FS Share Cnt: 1 Dynamic Superblk Blknum: 0
Per Txn Block Limit Journal: 0 Data: 0
Block 1: Journal Commit Block
Seq: 14 Type: 2 (JBD2_COMMIT_BLOCK)
Block 2: Journal Descriptor
Seq: 15 Type: 1 (JBD2_DESCRIPTOR_BLOCK)
No. Blocknum Flags
0. 587 none
UUID: 00000000000000000000000000000000
1. 8257792 JBD2_FLAG_SAME_UUID
2. 619 JBD2_FLAG_SAME_UUID
3. 24772864 JBD2_FLAG_SAME_UUID
4. 8257802 JBD2_FLAG_SAME_UUID
5. 513 JBD2_FLAG_SAME_UUID JBD2_FLAG_LAST_TAG
...
Block 7: Inode
Inode: 8257802 Mode: 0640 Generation: 57157641 (0x3682809)
FS Generation: 2839773110 (0xa9437fb6)
CRC32: 00000000 ECC: 0000
Type: Regular Attr: 0x0 Flags: Valid
Dynamic Features: (0x1) InlineData
User: 0 (root) Group: 0 (root) Size: 7
Links: 1 Clusters: 0
ctime: 0x5de5d870 0x11104c61 -- Tue Dec 3 11:37:20.286280801 2019
atime: 0x5de5d870 0x113181a1 -- Tue Dec 3 11:37:20.288457121 2019
mtime: 0x5de5d870 0x11104c61 -- Tue Dec 3 11:37:20.286280801 2019
dtime: 0x0 -- Thu Jan 1 08:00:00 1970
...
Block 9: Journal Commit Block
Seq: 15 Type: 2 (JBD2_COMMIT_BLOCK)
The following is jouranl recovery log when recovering the upper jbd2
journal when mount again.
syslog:
[ 2265.648622] ocfs2: File system on device (252,1) was not unmounted cleanly, recovering it.
[ 2265.649695] fs/jbd2/recovery.c:(do_one_pass, 449): Starting recovery pass 0
[ 2265.650407] fs/jbd2/recovery.c:(do_one_pass, 449): Starting recovery pass 1
[ 2265.650409] fs/jbd2/recovery.c:(do_one_pass, 449): Starting recovery pass 2
[ 2265.650410] fs/jbd2/recovery.c:(jbd2_journal_recover, 278): JBD2: recovery, exit status 0, recovered transactions 13 to 13
Due to first commit seq 13 recorded in journal super is not consistent
with the value recorded in block 1(seq is 14), journal recovery will be
terminated before seq 15 even though it is an unbroken commit, inode
8257802 is a new file and it will be lost.
Signed-off-by: Kai Li
---
fs/ocfs2/journal.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c
index 1afe57f425a0..5c7a489f47b0 100644
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
@@ -1066,6 +1066,15 @@ int ocfs2_journal_load(struct ocfs2_journal *journal, int local, int replayed)
ocfs2_clear_journal_error(osb->sb, journal->j_journal, osb->slot_num);
+ if (replayed) {
+ mlog(ML_NOTICE, "journal recovery complete");
+ jbd2_journal_lock_updates(journal->j_journal);
+ status = jbd2_journal_flush(journal->j_journal);
+ jbd2_journal_unlock_updates(journal->j_journal);
+ if (status < 0)
+ mlog_errno(status);
+ }
+
status = ocfs2_journal_toggle_dirty(osb, 1, replayed);
if (status < 0) {
mlog_errno(status);