From: Giuseppe Di Natale <dinatale2@users.noreply.github.com>
Date: Wed, 21 Feb 2018 00:28:52 +0000 (-0800)
Subject: Correct count_uberblocks in mmp.kshlib
X-Git-Tag: zfs-0.7.7~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5b10b3ef3b5e82b9e5a9bee122f1a0be007dae2;p=zfs

Correct count_uberblocks in mmp.kshlib

A log_must call was causing count_uberblocks to return more
than just the uberblock count. Remove the log_must since it
was only logging a sleep.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
Reviewed-by: loli10K <ezomori.nozomu@gmail.com>
Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Closes #7191
---

diff --git a/tests/zfs-tests/tests/functional/mmp/mmp.kshlib b/tests/zfs-tests/tests/functional/mmp/mmp.kshlib
index 4c46ae7a2..1f8d66fd9 100644
--- a/tests/zfs-tests/tests/functional/mmp/mmp.kshlib
+++ b/tests/zfs-tests/tests/functional/mmp/mmp.kshlib
@@ -198,6 +198,6 @@ function count_uberblocks # pool duration
 	typeset -i duration=$2
 	typeset hist_path="/proc/spl/kstat/zfs/$pool/multihost"
 
-	log_must sleep $duration
+	sleep $duration
 	echo $(cat "$hist_path" | sed '1,2d' | wc -l)
 }