mirror/findutils
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/findutils.git synced 2026-01-26 15:39:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: migrate 'many-dir-entries-vs-OOM' to the new testsuite

Browse Source 
For migrating, merge with the basic structure from 'tests/sample-test',
i.e., source in 'tests/init.sh', call 'print_ver_', "Exit $fail",  etc.
Also remove now-common functions like die() and framework_failure_().

* find/testsuite/sv-34079.sh: Move to ...
* tests/find/many-dir-entries-vs-OOM.sh: ... this, and apply the above.
While at it, loosely pull in changes from the related test in the
GNU coreutils [1]:
Create only 200,000 files, rather than 4 million.  The latter was overkill,
and was too likely to fail due to inode exhaustion.  Now that this test
doesn't take so long, label it as merely "expensive", rather than
"very expensive".
Furthermore, simplify the test data creation, and use the ulimit specifically
for each program under test (find, oldfind).
* find/testsuite/Makefile.am (tests_shell_progs): Remove the reference
to this test ...
* tests/local.mk (all_tests): .. and add it here.

[1]
https://git.sv.gnu.org/cgit/coreutils.git/tree/tests/rm/many-dir-entries-vs-OOM.sh?id=4711c49312d5
This commit is contained in:
Bernhard Voelker 2019-01-09 00:24:34 +01:00
parent f72b299cdd
commit 8a2f24d5ff
4 changed files with 95 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
find/testsuite/Makefile.am
View File

@ -260,7 +260,6 @@ test_escapechars.sh \
test_escape_c.sh \
test_inode.sh \
test_type-list.sh \
sv-34079.sh \
sv-34976-execdir-fd-leak.sh \
sv-48030-exec-plus-bug.sh \
sv-48180-refuse-noop.sh \

141
find/testsuite/sv-34079.sh
View File

@ -1,141 +0,0 @@
#! /bin/sh
# Copyright (C) 2011-2019 Free Software Foundation, Inc.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
# This test verifies that find does not have excessive memory consumption
# even for large directories. It's not executed by default; it will only
# run if the environment variable RUN_VERY_EXPENSIVE_TESTS=yes is set.
testname="$(basename $0)"
. "${srcdir}"/binary_locations.sh
skip_() { # TODO factor out to a central place.
echo "$testname: $@" >&2
exit 77;
}
framework_failure_() { # TODO factor out to a central place.
echo "$testname: error during test set-up" >&2
exit 99;
}
very_expensive_() { # TODO factor out to a central place.
if test "$RUN_VERY_EXPENSIVE_TESTS" != yes; then
echo 'very expensive: disabled by default
This test is very expensive, so it is disabled by default.
To run it anyway, rerun make check with the RUN_VERY_EXPENSIVE_TESTS
environment variable set to yes. E.g.,
env RUN_VERY_EXPENSIVE_TESTS=yes make check
' >&2
exit 77
fi
}
very_expensive_
# Require seq(1) for this test - which may not be available
# on some systems, e.g on some *BSDs.
seq -f "_%04g" 0 2 >/dev/null 2>&1 \
|| skip_ "required utility 'seq' missing"
# Get the number of free inodes on the file system of the given file/directory.
get_ifree_() {
d="$1"
d="$1"
# Try GNU coreutils' stat.
stat --format='%d' -f -- "$d" 2>/dev/null \
&& return 0
# Fall back to parsing 'df -i' output.
df -i -- "$d" \
| awk '
NR == 1 { # Find ifree column.
ifree = -1;
for (i=1; i<=NF; i++) {
n=tolower($i);
if(n=="ifree" || n=="iavail") {
ifree=i;
}
};
if (ifree<=0) {
print "failed to determine IFREE column in header: ", $0 | "cat 1>&2";
exit 1;
}
next;
}
{ print $ifree }
' \
| grep .
}
make_test_data() {
d="$1"
(
cd "$1" || framework_failure_
echo "Creating test data in '$(pwd -P)' (this may take some time...)" >&2
maxi=400; maxj=10000
# Skip early if we know that there are too few free inodes.
# Require some slack.
free_inodes=$(get_ifree_ '.') \
&& test 0 -lt $free_inodes \
&& min_free_inodes=$(expr 12 \* $maxi \* $maxj / 10) \
&& { test $min_free_inodes -lt $free_inodes \
|| skip_ "too few free inodes on '.': $free_inodes;" \
"this test requires at least $min_free_inodes"; }
for i in $(seq -f "%03g" 0 $maxi)
do
printf "\r${i}/${maxi}" >&2
seq -f "${i}_%04g" 0 $maxj | xargs touch || skip_ "touch failed"
done
printf "\rTest files created.\n" >&2
)
}
# Remove the temporary directory and exit with the incoming value of $?.
remove_outdir_ ()
{
__st=$?
rm -rf "${outdir}" || { test $__st = 0 && __st=1; }
exit $__st
}
outdir=$(mktemp -d) || framework_failure_
trap remove_outdir_ 0
# Create some test files.
make_test_data "${outdir}" \
|| skip_ "failed to set up the test in '${outdir}'"
fail=0
# We don't check oldfind, as it uses savedir, meaning that
# it stores all the directory entries. Hence the excessive
# memory consumption bug applies to oldfind even though it is
# not using fts.
for exe in "${ftsfind}" "${oldfind}"; do
echo "Checking memory consumption of ${exe}..." >&2
if ( ulimit -v 50000 && ${exe} "${outdir}" >/dev/null; ); then
echo "Memory consumption of ${exe} is reasonable" >&2
else
echo "${exe}: memory consumption is too high"
fail=1
fi
done
exit $fail

94
tests/find/many-dir-entries-vs-OOM.sh Executable file
View File

@ -0,0 +1,94 @@
#!/bin/sh
# This test verifies that find does not have excessive memory consumption
# even for large directories.
# See Savannah bug #34079.
# Copyright (C) 2011-2019 Free Software Foundation, Inc.
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
. "${srcdir=.}/tests/init.sh"
print_ver_ find oldfind
# Mark as expensive.
expensive_
NFILES=200000
# Require seq(1) for this test - which may not be available
# on some systems, e.g on some *BSDs.
seq -f "_%04g" 0 2 >/dev/null 2>&1 \
|| skip_ "required utility 'seq' missing"
# Get the number of free inodes on the file system of the given file/directory.
get_ifree_() {
d="$1"
# Try GNU coreutils' stat.
stat --format='%d' -f -- "$d" 2>/dev/null \
&& return 0
# Fall back to parsing 'df -i' output.
df -i -- "$d" \
| awk '
NR == 1 { # Find ifree column.
ifree = -1;
for (i=1; i<=NF; i++) {
n=tolower($i);
if(n=="ifree" || n=="iavail") {
ifree=i;
}
};
if (ifree<=0) {
print "failed to determine IFREE column in header: ", $0 | "cat 1>&2";
exit 1;
}
next;
}
{ print $ifree }
' \
| grep .
}
# Skip early if we know that there are too few free inodes.
# Require some slack.
free_inodes=$(get_ifree_ '.') \
&& test 0 -lt $free_inodes \
&& min_free_inodes=$(expr 12 \* ${NFILES} / 10) \
&& { test $min_free_inodes -lt $free_inodes \
|| skip_ "too few free inodes on '.': $free_inodes;" \
"this test requires at least $min_free_inodes"; }
# Create directory with many entries.
mkdir dir && cd dir || framework_failure_
seq ${NFILES} | xargs touch || framework_failure_
cd ..
# Create a small directory as reference to determine lower ulimit.
mkdir dir2 && touch dir2/a dir2/b dir2/c || framework_failure_
# We don't check oldfind, as it uses savedir, meaning that
# it stores all the directory entries. Hence the excessive
# memory consumption bug applies to oldfind even though it is
# not using fts.
for exe in find oldfind; do
# Determine memory consumption for the trivial case.
vm="$(get_min_ulimit_v_ ${exe} dir2 -fprint dummy)" \
|| skip_ "this shell lacks ulimit support"
# Allow 35MiB more memory than above.
( ulimit -v $(($vm + 35000)) && ${exe} dir >/dev/null ) \
|| { echo "${exe}: memory consumption is too high" >&2; fail=1; }
done
Exit $fail

1
tests/local.mk
View File

@ -104,6 +104,7 @@ check-root:
all_tests = \
tests/misc/help-version.sh \
tests/find/many-dir-entries-vs-OOM.sh \
$(all_root_tests)
$(TEST_LOGS): $(PROGRAMS)