From: Eric Whitney Date: Fri, 23 Jun 2017 21:28:12 +0000 (-0400) Subject: tests: add new test f_del_dup_quota X-Git-Tag: v1.43.5~43 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1dc09bd9c1fdd63cfb1840a96f15e7ba13e1b40b;hp=fff2d1273f45b161096fd9942dd637a691ca6158;p=tools%2Fe2fsprogs.git tests: add new test f_del_dup_quota Add a test to validate the changes in commit b0f5fa880c36: "e2fsck: fix multiply-claimed block quota accounting when deleting files". Signed-off-by: Eric Whitney Signed-off-by: Theodore Ts'o --- diff --git a/tests/f_del_dup_quota/expect.1 b/tests/f_del_dup_quota/expect.1 new file mode 100644 index 0000000..71b7440 --- /dev/null +++ b/tests/f_del_dup_quota/expect.1 @@ -0,0 +1,39 @@ +Pass 1: Checking inodes, blocks, and sizes + +Running additional passes to resolve blocks claimed by more than one inode... +Pass 1B: Rescanning for multiply-claimed blocks +Multiply-claimed block(s) in inode 12: 8129 +Multiply-claimed block(s) in inode 13: 8129 +Pass 1C: Scanning directories for inodes with multiply-claimed blocks +Pass 1D: Reconciling multiply-claimed blocks +(There are 2 inodes containing multiply-claimed blocks.) + +File /testfile1 (inode #12, mod time Wed May 24 23:10:38 2017) + has 1 multiply-claimed block(s), shared with 1 file(s): + /testfile2 (inode #13, mod time Wed May 24 23:10:45 2017) +Clone multiply-claimed blocks? no +Delete file? yes +File /testfile2 (inode #13, mod time Wed May 24 23:10:45 2017) + has 1 multiply-claimed block(s), shared with 1 file(s): + /testfile1 (inode #12, mod time Wed May 24 23:10:38 2017) +Multiply-claimed blocks already reassigned or cloned. + +Pass 2: Checking directory structure +Entry 'testfile1' in / (2) has deleted/unused inode 12. Clear? yes +Pass 3: Checking directory connectivity +Pass 4: Checking reference counts +Pass 5: Checking group summary information +Block bitmap differences: -1374 +Fix? yes +Free blocks count wrong for group #0 (6815, counted=6816). +Fix? yes +Free blocks count wrong (6815, counted=6816). +Fix? yes +[QUOTA WARNING] Usage inconsistent for ID 0:actual (15360, 3) != expected (17408, 4) +Update quota info for quota type 0? yes +[QUOTA WARNING] Usage inconsistent for ID 0:actual (15360, 3) != expected (17408, 4) +Update quota info for quota type 1? yes + +test_filesys: ***** FILE SYSTEM WAS MODIFIED ***** +test_filesys: 12/2048 files (33.3% non-contiguous), 1376/8192 blocks +Exit status is 0 diff --git a/tests/f_del_dup_quota/expect.2 b/tests/f_del_dup_quota/expect.2 new file mode 100644 index 0000000..14f99b8 --- /dev/null +++ b/tests/f_del_dup_quota/expect.2 @@ -0,0 +1,7 @@ +Pass 1: Checking inodes, blocks, and sizes +Pass 2: Checking directory structure +Pass 3: Checking directory connectivity +Pass 4: Checking reference counts +Pass 5: Checking group summary information +test_filesys: 12/2048 files (25.0% non-contiguous), 1376/8192 blocks +Exit status is 0 diff --git a/tests/f_del_dup_quota/image.bz2 b/tests/f_del_dup_quota/image.bz2 new file mode 100644 index 0000000..fc91e2a Binary files /dev/null and b/tests/f_del_dup_quota/image.bz2 differ diff --git a/tests/f_del_dup_quota/name b/tests/f_del_dup_quota/name new file mode 100644 index 0000000..8b29fd4 --- /dev/null +++ b/tests/f_del_dup_quota/name @@ -0,0 +1 @@ +delete file containing multiply claimed blocks with quota diff --git a/tests/f_del_dup_quota/script b/tests/f_del_dup_quota/script new file mode 100644 index 0000000..5480c3f --- /dev/null +++ b/tests/f_del_dup_quota/script @@ -0,0 +1,34 @@ +#!/bin/bash + +IMAGE=$test_dir/image.bz2 + +bzip2 -d < $IMAGE > $TMPFILE + +# Run fsck to fix the multiply-claimed block breakage +FSCK_OPT=-f +EXP1=$test_dir/expect.1 +OUT1=$test_name.1.log + +echo "nyyyyyyy" | E2FSCK_FORCE_INTERACTIVE=y $FSCK $FSCK_OPT -N test_filesys $TMPFILE 2>&1 | head -n 1000 | tail -n +2 > $OUT1 +echo "Exit status is $?" >> $OUT1 + +# Run a second time to verify that fsck completely repaired everything in +# the first run, including quota corrections +FSCK_OPT=-fn +EXP2=$test_dir/expect.2 +OUT2=$test_name.2.log + +$FSCK $FSCK_OPT -N test_filesys $TMPFILE 2>&1 | head -n 1000 | tail -n +2 > $OUT2 +echo "Exit status is $?" >> $OUT2 + +# Figure out what happened +rm -f $test_name.failed $test_name.ok +if cmp -s $EXP1 $OUT1 && cmp -s $EXP2 $OUT2; then + echo "$test_name: $test_description: ok" + touch $test_name.ok +else + echo "$test_name: $test_description: failed" + diff -u $EXP1 $OUT1 >> $test_name.failed + diff -u $EXP2 $OUT2 >> $test_name.failed +fi +unset EXP1 OUT1 EXP2 OUT2 FSCK_OPT IMAGE