Skip to contentSkip to conversation

lib: tst_umount: umount a mount point instead of a device

PATCH Superseded Leo Liang 2 participants 4 messages Aug 4, 2021 – Aug 24, 2021

v6 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Leo Liang

author
#0 lore raw

PATCH v6 1/4 lib: tst_umount: umount a mount point instead of a device

Current check inside tst_umount for whehter a device is mounted is ambiguous. Fix it by checking for the existance of the exact mount point the fs is mounted upon, and use the mount point instead of the device to do the umount process. This patch make tst_umount umount TST_MNTPOINT by default,
and reject any argument that does not start with '/'.

---
 testcases/lib/tst_test.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
testcases/lib/tst_test.sh +11 -7
index c6aa2c487..1060bda2f 100644
@@ -277,31 +277,35 @@ tst_mount()
 
 tst_umount()
 {
-	local device="${1:-$TST_DEVICE}"
+	local mntpoint="${1:-$TST_MNTPOINT}"
 	local i=0
 
-	[ -z "$device" ] && return
+	[ -z "$mntpoint" ] && return
 
-	if ! grep -q "$device" /proc/mounts; then
-		tst_res TINFO "The $device is not mounted, skipping umount"
+	if [[ "$mntpoint" != /* ]]; then
+		tst_brk TCONF "The $mntpoint is not an absolute path"
+	fi
+
+	if ! grep -q "${mntpoint%/}" /proc/mounts; then
+		tst_res TINFO "The $mntpoint is not mounted upon, skipping umount"
 		return
 	fi
 
 	while [ "$i" -lt 50 ]; do
-		if umount "$device" > /dev/null; then
+		if umount "$mntpoint" > /dev/null; then
 			return
 		fi
 
 		i=$((i+1))
 
-		tst_res TINFO "umount($device) failed, try $i ..."
+		tst_res TINFO "umount($mntpoint) failed, try $i ..."
 		tst_res TINFO "Likely gvfsd-trash is probing newly mounted "\
 		              "fs, kill it to speed up tests."
 
 		tst_sleep 100ms
 	done
 
-	tst_res TWARN "Failed to umount($device) after 50 retries"
+	tst_res TWARN "Failed to umount($mntpoint) after 50 retries"
 }
 
 tst_mkfs()
Signature · 1 line
2.17.0
#1 lore raw

PATCH v6 1/4 lib: tst_umount: umount a mount point instead of a device

Quoted 19 lines

Current check inside tst_umount for whehter a device is mounted is ambiguous. Fix it by checking for the existance of the exact mount point the fs is mounted upon, and use the mount point instead of the device to do the umount process. This patch make tst_umount umount TST_MNTPOINT by default,
and reject any argument that does not start with '/'.

---
 testcases/lib/tst_test.sh | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
testcases/lib/tst_test.sh +0 -0
index c6aa2c487..1060bda2f 100644
@@ -277,31 +277,35 @@ tst_mount()
 
 tst_umount()
 {

testcases/lib/tst_test.sh tst_mount() · line 285

Quoted 10 lines
testcases/lib/tst_test.sh +3 -4
-	local device="${1:-$TST_DEVICE}"
+	local mntpoint="${1:-$TST_MNTPOINT}"
 	local i=0
 
-	[ -z "$device" ] && return
+	[ -z "$mntpoint" ] && return
 
-	if ! grep -q "$device" /proc/mounts; then
-		tst_res TINFO "The $device is not mounted, skipping umount"
+	if [[ "$mntpoint" != /* ]]; then

[[ ]] is a bashism, it cannot be used. [1]
Instead grep must be used to compare regex:

if echo "$mntpoint" |grep -q ^/; then

This can be changed during merge.

[1] https://github.com/linux-test-project/ltp/wiki/Test-Writing-Guidelines#22-shell-coding-style

Quoted 29 lines
testcases/lib/tst_test.sh +8 -3
+		tst_brk TCONF "The $mntpoint is not an absolute path"
+	fi
+
+	if ! grep -q "${mntpoint%/}" /proc/mounts; then
+		tst_res TINFO "The $mntpoint is not mounted upon, skipping umount"
 		return
 	fi
 
 	while [ "$i" -lt 50 ]; do
-		if umount "$device" > /dev/null; then
+		if umount "$mntpoint" > /dev/null; then
 			return
 		fi
 
 		i=$((i+1))
 
-		tst_res TINFO "umount($device) failed, try $i ..."
+		tst_res TINFO "umount($mntpoint) failed, try $i ..."
 		tst_res TINFO "Likely gvfsd-trash is probing newly mounted "\
 		              "fs, kill it to speed up tests."
 
 		tst_sleep 100ms
 	done
 
-	tst_res TWARN "Failed to umount($device) after 50 retries"
+	tst_res TWARN "Failed to umount($mntpoint) after 50 retries"
 }
 
 tst_mkfs()
#2 lore raw

PATCH v6 1/4 lib: tst_umount: umount a mount point instead of a device

In reply to Leo Liang

Hi Leo,

as I noted at forth patch, some tests use tst_umount with the default parameter. Thus we should set the default TST_MNTPOINT to use $PWD as well.

I'd also add quotes around $mntpoint in TCONF/TINFO messages in tst_mount() as the original message was a bit confusing when the mountpoint was called 'mntpoint' (TWARN: The mntpoint is not an absolute path).

Kind regards,
Petr

+++ testcases/lib/tst_test.sh
@@ -279,31 +279,35 @@ tst_mount()

tst_umount()
{
- local device="${1:-$TST_DEVICE}"
+ local mntpoint="${1:-$TST_MNTPOINT}"
local i=0

- [ -z "$device" ] && return
+ [ -z "$mntpoint" ] && return

- if ! grep -q "$device" /proc/mounts; then
- tst_res TINFO "The $device is not mounted, skipping umount"
+ if ! echo "$mntpoint" | grep -q ^/; then
+ tst_brk TCONF "The '$mntpoint' is not an absolute path"
+ fi
+
+ if ! grep -q "${mntpoint%/}" /proc/mounts; then
+ tst_res TINFO "The '$mntpoint' is not mounted upon, skipping umount"
return
fi

while [ "$i" -lt 50 ]; do
- if umount "$device" > /dev/null; then
+ if umount "$mntpoint" > /dev/null; then
return
fi

i=$((i+1))

- tst_res TINFO "umount($device) failed, try $i ..."
+ tst_res TINFO "umount($mntpoint) failed, try $i ..."
tst_res TINFO "Likely gvfsd-trash is probing newly mounted "\
"fs, kill it to speed up tests."

tst_sleep 100ms
done

- tst_res TWARN "Failed to umount($device) after 50 retries"
+ tst_res TWARN "Failed to umount($mntpoint) after 50 retries"
}

tst_mkfs()
@@ -628,7 +632,7 @@ tst_run()
cd "$TST_TMPDIR"
fi

- TST_MNTPOINT="${TST_MNTPOINT:-mntpoint}"
+ TST_MNTPOINT="${TST_MNTPOINT:-$PWD/mntpoint}"
if [ "$TST_NEEDS_DEVICE" = 1 ]; then

TST_DEVICE=$(tst_device acquire)

author
#3 lore raw

PATCH v6 1/4 lib: tst_umount: umount a mount point instead of a device

Hi Petr,

Understood! Thanks for explaining everything!
I will send a v7 soon including all the modifications needed.

Best regards,
Leo

Quoted 22 lines · Petr Vorel

Hi Leo,

as I noted at forth patch, some tests use tst_umount with the default parameter. Thus we should set the default TST_MNTPOINT to use $PWD as well.

I'd also add quotes around $mntpoint in TCONF/TINFO messages in tst_mount() as the original message was a bit confusing when the mountpoint was called 'mntpoint' (TWARN: The mntpoint is not an absolute path).

Kind regards,
Petr

+++ testcases/lib/tst_test.sh

testcases/lib/tst_test.sh +1 -2
@@ -279,31 +279,35 @@ tst_mount()
 
 tst_umount()
 {
-	local device="${1:-$TST_DEVICE}"
+	local mntpoint="${1:-$TST_MNTPOINT}"
 	local i=0
 
-	[ -z "$device" ] && return

testcases/lib/tst_test.sh tst_mount() · line 292

Quoted 10 lines
testcases/lib/tst_test.sh +7 -2
+	[ -z "$mntpoint" ] && return
 
-	if ! grep -q "$device" /proc/mounts; then
-		tst_res TINFO "The $device is not mounted, skipping umount"
+	if ! echo "$mntpoint" | grep -q ^/; then
+		tst_brk TCONF "The '$mntpoint' is not an absolute path"
+	fi
+
+	if ! grep -q "${mntpoint%/}" /proc/mounts; then
+		tst_res TINFO "The '$mntpoint' is not mounted upon, skipping umount"

Will add this in v7!

Quoted 25 lines
testcases/lib/tst_test.sh +3 -3
 		return
 	fi
 
 	while [ "$i" -lt 50 ]; do
-		if umount "$device" > /dev/null; then
+		if umount "$mntpoint" > /dev/null; then
 			return
 		fi
 
 		i=$((i+1))
 
-		tst_res TINFO "umount($device) failed, try $i ..."
+		tst_res TINFO "umount($mntpoint) failed, try $i ..."
 		tst_res TINFO "Likely gvfsd-trash is probing newly mounted "\
 		              "fs, kill it to speed up tests."
 
 		tst_sleep 100ms
 	done
 
-	tst_res TWARN "Failed to umount($device) after 50 retries"
+	tst_res TWARN "Failed to umount($mntpoint) after 50 retries"
 }
 
 tst_mkfs()

testcases/lib/tst_test.sh tst_run() · line 635

Quoted 5 lines
testcases/lib/tst_test.sh +1 -1
@@ -628,7 +632,7 @@ tst_run()
 		cd "$TST_TMPDIR"
 	fi
 
-	TST_MNTPOINT="${TST_MNTPOINT:-mntpoint}"
+	TST_MNTPOINT="${TST_MNTPOINT:-$PWD/mntpoint}"

This is a good catch.
I think I did notice that df01.sh uses tst_umount as a clean up function, but didn't realize that this should be changed! Thanks for the heads up!

Quoted 3 lines
(quoted diff) +0 -0
 	if [ "$TST_NEEDS_DEVICE" = 1 ]; then
 
 		TST_DEVICE=$(tst_device acquire)