summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2017-10-11 09:15:44 -0700
committerGitHub <[email protected]>2017-10-11 09:15:44 -0700
commit29e07af5ae77e0ddf9ccfb77684f9713627b2ceb (patch)
tree0f3b395cd7ced4f4a1d453289f3a339f7b120d3e
parent523d5ce0f48a1b7127345d830e5a34079cace322 (diff)
Fix chattr/cleanup failure
The chattr cleanup step may fail to delete the user if there is still an active process running as that user. Retry the userdel when this occurs to eliminate spurious false positves. ERROR: userdel quser1 exited 8 userdel: user quser1 is currently used by process 26814 Reviewed-by: George Melikov <[email protected]> Reviewed-by: Giuseppe Di Natale <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #6749
-rw-r--r--tests/zfs-tests/include/libtest.shlib2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/zfs-tests/include/libtest.shlib b/tests/zfs-tests/include/libtest.shlib
index d72ebc8ed..14348d7c6 100644
--- a/tests/zfs-tests/include/libtest.shlib
+++ b/tests/zfs-tests/include/libtest.shlib
@@ -2296,7 +2296,7 @@ function del_user #<logname> <basedir>
fi
if id $user > /dev/null 2>&1; then
- log_must userdel $user
+ log_must_retry "currently used" 5 userdel $user
fi
[[ -d $basedir/$user ]] && rm -fr $basedir/$user