From patchwork Wed Feb 15 15:45:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Blagodarenko X-Patchwork-Id: 728269 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vNkCR2dgZz9ryv for ; Thu, 16 Feb 2017 02:45:55 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ViE0OVO4"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751286AbdBOPpy (ORCPT ); Wed, 15 Feb 2017 10:45:54 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:33388 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751140AbdBOPpx (ORCPT ); Wed, 15 Feb 2017 10:45:53 -0500 Received: by mail-it0-f68.google.com with SMTP id e137so10159500itc.0 for ; Wed, 15 Feb 2017 07:45:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QxCGEj2vnsGMgnkfDGlClQ9VQG6FIpIuMPCDXrQtOb4=; b=ViE0OVO4yActCqFw+OaCNye0YxBYtOyKADS6cKcI9qWLjHarIrBH68NoPHu0Y5okIl Zcl4RHPbs1/7KA9sNpGwdK8G+tRas1RwqDUSmUPjNCdchoqLb2cXOzuVFQnP2sW5ix3g wKHY4QPLFjuk58Q2Q9FX7HK5atDwvJRRYn29o0z0WLGBYFIMxW3oKRMMvTzAuDZ0rHV3 acf0+avTvldPwcndeoy50fmy85ZeUtP02pQC09F9kMR6OUqt98JmTzV15a/AJxhWY19D DqBn0Wig/JyRjWogE6Jdp6dIFu0elxW0eybWR+irxORwiybaVN/n7WENbrCMF6YuWhEO IhaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QxCGEj2vnsGMgnkfDGlClQ9VQG6FIpIuMPCDXrQtOb4=; b=ezCftX9bN7xC4iS23MG7HMHk5L6B2qH2Uv0MDJt45FRnl790157O3BmplU+RpxITOc s8UE3GObZODNm7qS7BN15RkjG+ToP3y1l6/CaLPb6FiPCSh5JQ5i5seaCtsHlgqfEQ3T j0W5/yY2Is5NJF7Fji5hRD1VVfKkeahwhtdVOSXCAcoVKeEhxcSMd4yEgVcChMv/aVR7 DTUqaNpRU8ahh2ZOLLSfZPPxNnFMn9r8n4dMokLiQGvgAX+98GpOvktf3SXOONEvhtfM QmimKBDy4hYDfvo0qb1vSzoQ7S7knvEUvv1tqMIa1eQnYWNOlTEjGgdzdCJwtRs91i6l kq2w== X-Gm-Message-State: AMke39kXjZakp+WrYOZggIJkoRPzFp3Yyh74Dotidird3jg3VhENMxEw+vvprfH/Iw3yBw== X-Received: by 10.36.111.143 with SMTP id x137mr8650280itb.42.1487173552813; Wed, 15 Feb 2017 07:45:52 -0800 (PST) Received: from localhost.localdomain ([91.105.194.148]) by smtp.googlemail.com with ESMTPSA id 66sm1889478iok.5.2017.02.15.07.45.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 15 Feb 2017 07:45:52 -0800 (PST) From: Artem Blagodarenko To: linux-ext4@vger.kernel.org Cc: adilger.kernel@dilger.ca Subject: [PATCH v3 4/4] tests: 3 level hash tree test Date: Wed, 15 Feb 2017 18:45:47 +0300 Message-Id: <1487173547-95990-1-git-send-email-artem.blagodarenko@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <40D3354F-7FF3-44E1-A122-0C0D21042BFF@dilger.ca> References: <40D3354F-7FF3-44E1-A122-0C0D21042BFF@dilger.ca> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Artem Blagodarenko Test is added that recreate directory (-fD fsck option) with 47.5k of 255-symbol name files. This amount of files can not be stored only in 2 hevel htree, so 3 levels are used. Signed-off-by: Artem Blagodarenko Reviewed-by: Andreas Dilger --- tests/f_large_dir/expect | 12 +++++++++++ tests/f_large_dir/name | 1 + tests/f_large_dir/script | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 0 deletions(-) diff --git a/tests/f_large_dir/expect b/tests/f_large_dir/expect new file mode 100644 index 0000000..b099460 --- /dev/null +++ b/tests/f_large_dir/expect @@ -0,0 +1,12 @@ +Pass 1: Checking inodes, blocks, and sizes +Pass 2: Checking directory structure +Pass 3: Checking directory connectivity +Pass 3A: Optimizing directories +Pass 4: Checking reference counts +Inode 13 ref count is 1, should be 47245. Fix? yes + +Pass 5: Checking group summary information + +test.img: ***** FILE SYSTEM WAS MODIFIED ***** +test.img: 13/115368 files (0.0% non-contiguous), 32817/460800 blocks +Exit status is 1 diff --git a/tests/f_large_dir/name b/tests/f_large_dir/name new file mode 100644 index 0000000..4b96890 --- /dev/null +++ b/tests/f_large_dir/name @@ -0,0 +1 @@ +optimize 3 level htree directories diff --git a/tests/f_large_dir/script b/tests/f_large_dir/script new file mode 100644 index 0000000..e68576d --- /dev/null +++ b/tests/f_large_dir/script @@ -0,0 +1,47 @@ +OUT=$test_name.log +EXP=$test_dir/expect +E2FSCK=../e2fsck/e2fsck + +NAMELEN=255 +DIRENT_SZ=8 +BLOCKSZ=1024 +DIRENT_PER_LEAF=$((BLOCKSZ / (NAMELEN + DIRENT_SZ))) +HEADER=32 +INDEX_SZ=8 +INDEX_L1=$(((BLOCKSZ - HEADER) / INDEX_SZ)) +INDEX_L2=$(((BLOCKSZ - DIRENT_SZ) / INDEX_SZ)) +ENTRIES=$((INDEX_L1 * INDEX_L2 * DIRENT_PER_LEAF)) + +cp /dev/null $OUT +$MKE2FS -b 1024 -O large_dir,uninit_bg,dir_nlink -F $TMPFILE 460800 > /dev/null +{ + echo "feature large_dir" + echo "mkdir /foo" + echo "cd /foo" + touch foofile + echo "write foofile foofile" + for ((i = 0; i < $ENTRIES; i++)); do + [[ $(( i % DIRENT_PER_LEAF )) -eq 0 ]] && echo "expand ./" + [[ $(( i % 5000 )) -eq 0 ]] && >&2 echo "$i processed" + printf "ln foofile %0255X\n" $i + done +} | $DEBUGFS -w -f /dev/stdin $TMPFILE > /dev/null + +$E2FSCK -yfD $TMPFILE > $OUT.new 2>&1 +status=$? +echo Exit status is $status >> $OUT.new +sed -f $cmd_dir/filter.sed -e "s;$TMPFILE;test.img;" $OUT.new >> $OUT +rm -f $OUT.new + +cmp -s $OUT $EXP +RC=$? +if [ $RC -eq 0 ]; then + echo "$test_name: $test_description: ok" + touch $test_name.ok +else + echo "$test_name: $test_description: failed" + diff -u $EXP $OUT > $test_name.failed +fi + + +