From patchwork Mon Jun 11 09:10:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 10457413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 755CE60532 for ; Mon, 11 Jun 2018 09:10:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E27427F85 for ; Mon, 11 Jun 2018 09:10:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 62E4628066; Mon, 11 Jun 2018 09:10:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03D3D27F95 for ; Mon, 11 Jun 2018 09:10:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754113AbeFKJKt (ORCPT ); Mon, 11 Jun 2018 05:10:49 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:38194 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754073AbeFKJKs (ORCPT ); Mon, 11 Jun 2018 05:10:48 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F10CA7B4A7; Mon, 11 Jun 2018 09:10:47 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-12-69.pek2.redhat.com [10.72.12.69]) by smtp.corp.redhat.com (Postfix) with ESMTP id 616EF2024CA1; Mon, 11 Jun 2018 09:10:44 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Cc: linux-xfs@vger.kernel.org Subject: [PATCH] xfs/170: increase agsize for bigger internal log size Date: Mon, 11 Jun 2018 17:10:40 +0800 Message-Id: <20180611091040.31495-1-zlang@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 11 Jun 2018 09:10:48 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Mon, 11 Jun 2018 09:10:48 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'zlang@redhat.com' RCPT:'' Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP xfs/170 always fails on xfs with "-m rmapbt=1,reflink=1", because XFS need bigger internal log size if rmapbt and reflink are both enabled. One line of xfs/170 as below: _test_streams 8 16 4 8 3 0 0 Refer to common/filestreams, we can see xfs/170 trys to create a 128M XFS (agcount=8, agsize=16M), then each stream writes 24M (8 * 3M files), and there're 4 streams. So the case expects each stream takes 2 AGs, 4 streams takes different 8 AGs just enough. But internal log will break this balance. For example: "mkfs.xfs -f -b size=4k -m rmapbt=1,reflink=1 $dev" will take 3075 4k blocks (12M) by default: meta-data=/dev/mapper/xxxx-xfscratch isize=512 agcount=8, agsize=4096 blks ... log =internal bsize=4096 blocks=3075, version=2 = sectsz=512 sunit=0 blks, lazy-count=1 ... And the internal log is in the 4th AG: # xfs_logprint: /dev/mapper/xxxx-xfscratch xfs_logprint: data device: 0xfd03 log device: 0xfd03 daddr: 131120 length: 24600 # xfs_db -c "convert daddr 131120 agno" /dev/mapper/xxxx-xfscratch 0x4 (4) Then if one stream write data into AG-1 at first, then turn to AG-4 after fill 16M agsize. But AG-4 has 12M space for log section, so only 4M free space for data. Then this stream have to turn to the next AG after fill the 4M space. All these as below: # xfs_bmap -vp stream2-dir/* stream2-dir/frame-1: EXT: FILE-OFFSET BLOCK-RANGE AG AG-OFFSET TOTAL FLAGS 0: [0..6143]: 32960..39103 1 (192..6335) 6144 000000 ... ... stream2-dir/frame-5: EXT: FILE-OFFSET BLOCK-RANGE AG AG-OFFSET TOTAL FLAGS 0: [0..6143]: 57536..63679 1 (24768..30911) 6144 000000 stream2-dir/frame-6: EXT: FILE-OFFSET BLOCK-RANGE AG AG-OFFSET TOTAL FLAGS 0: [0..6143]: 155776..161919 4 (24704..30847) 6144 000000 stream2-dir/frame-7: EXT: FILE-OFFSET BLOCK-RANGE AG AG-OFFSET TOTAL FLAGS 0: [0..6143]: 170088..176231 5 (6248..12391) 6144 000000 stream2-dir/frame-8: EXT: FILE-OFFSET BLOCK-RANGE AG AG-OFFSET TOTAL FLAGS 0: [0..6143]: 176232..182375 5 (12392..18535) 6144 000000 Later _test_streams maybe takes AG-5 again, and cause two streams use AG-5. To avoid this failure, increase the agsize from 16M to 22M, others stay the same, each stream still writes 2 AGs. Even internal log takes some space from someone AG, left space should be enough to write (24 - 22)=2M data. Signed-off-by: Zorro Lang --- tests/xfs/170 | 9 ++++----- tests/xfs/170.out | 8 ++++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/xfs/170 b/tests/xfs/170 index f82df69d..eb26764a 100755 --- a/tests/xfs/170 +++ b/tests/xfs/170 @@ -42,11 +42,10 @@ _check_filestreams_support || _notrun "filestreams not available" _set_stream_timeout_centisecs 3000 # test streams does a mkfs and mount -_test_streams 8 16 4 8 3 0 0 -_test_streams 8 16 4 8 3 1 0 -_test_streams 8 16 4 8 3 0 1 -_test_streams 8 16 4 8 3 1 1 +_test_streams 8 22 4 8 3 0 0 +_test_streams 8 22 4 8 3 1 0 +_test_streams 8 22 4 8 3 0 1 +_test_streams 8 22 4 8 3 1 1 status=0 exit - diff --git a/tests/xfs/170.out b/tests/xfs/170.out index a1339cec..e71515e9 100644 --- a/tests/xfs/170.out +++ b/tests/xfs/170.out @@ -1,20 +1,20 @@ QA output created by 170 -# testing 8 16 4 8 3 0 0 .... +# testing 8 22 4 8 3 0 0 .... # streaming # sync AGs... # checking stream AGs... + passed, streams are in seperate AGs -# testing 8 16 4 8 3 1 0 .... +# testing 8 22 4 8 3 1 0 .... # streaming # sync AGs... # checking stream AGs... + passed, streams are in seperate AGs -# testing 8 16 4 8 3 0 1 .... +# testing 8 22 4 8 3 0 1 .... # streaming # sync AGs... # checking stream AGs... + passed, streams are in seperate AGs -# testing 8 16 4 8 3 1 1 .... +# testing 8 22 4 8 3 1 1 .... # streaming # sync AGs... # checking stream AGs...