Skip to contentSkip to conversation

generic/273: Limit number of files by available inodes

PATCH Superseded Jan Kara 2 participants 3 messages Nov 30, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Jan Kara

author
#0 lore raw

PATCH 1/1 generic/273: Limit number of files by available inodes

Test generic/273 is failing for ext4 with 1k blocksize because it is creating more files than we have available inodes. Just limit the number of files created to the number of inodes.

---
 tests/generic/273 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
tests/generic/273 +9 -2
index f86dae9b8095..80c02d43c7ac 100755
@@ -50,9 +50,16 @@ _file_create()
 
 	cd $SCRATCH_MNT/origin
 
-	_disksize=`$DF_PROG -B 1 $SCRATCH_MNT | tail -1 | $AWK_PROG '{ print $5 }'`
+	_disksize=$(_get_available_space $SCRATCH_MNT)
+	_free_inodes=$(_get_free_inode $SCRATCH_MNT)
+	# Leave some slack for directories etc.
+	_free_inodes=$(($_free_inodes - $_free_inodes/8))
 	_disksize=$(($_disksize / 3))
-	_num=$(($_disksize / $count / $threads / $block_size))
+	_num=$(($_disksize / $count / $block_size))
+	if [ $_num -gt $_free_inodes ]; then
+		_num=$_free_inodes
+	fi
+	_num=$(($_num/$threads))
 	_count=$count
 	while [ $_i -lt $_num ]
 	do
Signature · 1 line
2.35.3
#1 lore raw
Quoted 15 lines · Jan Kara

Test generic/273 is failing for ext4 with 1k blocksize because it is creating more files than we have available inodes. Just limit the number of files created to the number of inodes.

---
 tests/generic/273 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
tests/generic/273 +0 -0
index f86dae9b8095..80c02d43c7ac 100755

tests/generic/273 _file_create() · line 54

Quoted 6 lines
tests/generic/273 +2 -1
@@ -50,9 +50,16 @@ _file_create()
 
        cd $SCRATCH_MNT/origin
 
-       _disksize=`$DF_PROG -B 1 $SCRATCH_MNT | tail -1 | $AWK_PROG '{ print $5 }'`
+       _disksize=$(_get_available_space $SCRATCH_MNT)
+       _free_inodes=$(_get_free_inode $SCRATCH_MNT)

Jan, this will always return 0 on btrfs, since it has no limits on the number of inodes, so it ends up not creating any files in the loop below.

We could call _require_inode_limits, but that would skip the test on btrfs. Can we leave the old calculation if get_free_inode returns 0? (and maybe leave a comment that a fs without inode limits returns 0)

Thanks.

Quoted 15 lines
tests/generic/273 +7 -2
+       # Leave some slack for directories etc.
+       _free_inodes=$(($_free_inodes - $_free_inodes/8))
        _disksize=$(($_disksize / 3))
-       _num=$(($_disksize / $count / $threads / $block_size))
+       _num=$(($_disksize / $count / $block_size))
+       if [ $_num -gt $_free_inodes ]; then
+               _num=$_free_inodes
+       fi
+       _num=$(($_num/$threads))
        _count=$count
        while [ $_i -lt $_num ]
        do
--

2.35.3

author
#2 lore raw
Quoted 26 lines · Filipe Manana
Quoted 15 lines · Jan Kara

Test generic/273 is failing for ext4 with 1k blocksize because it is creating more files than we have available inodes. Just limit the number of files created to the number of inodes.

---
 tests/generic/273 | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
tests/generic/273 +0 -0
index f86dae9b8095..80c02d43c7ac 100755

tests/generic/273 _file_create() · line 54

Quoted 6 lines
tests/generic/273 +2 -1
@@ -50,9 +50,16 @@ _file_create()
 
        cd $SCRATCH_MNT/origin
 
-       _disksize=`$DF_PROG -B 1 $SCRATCH_MNT | tail -1 | $AWK_PROG '{ print $5 }'`
+       _disksize=$(_get_available_space $SCRATCH_MNT)
+       _free_inodes=$(_get_free_inode $SCRATCH_MNT)

Jan, this will always return 0 on btrfs, since it has no limits on the number of inodes, so it ends up not creating any files in the loop below.

Quoted 3 lines

We could call _require_inode_limits, but that would skip the test on btrfs. Can we leave the old calculation if get_free_inode returns 0? (and maybe leave a comment that a fs without inode limits returns 0)

OK, makes sense. I'll do that. I was wondering for a while whether _get_free_inode shouldn't return something more sensible for btrfs but I guess it's difficult to come up with some universally OK value.

Honza

Signature · 2 lines
Jan Kara <[email protected]>
SUSE Labs, CR