]>
Commit | Line | Data |
---|---|---|
75b07eca FG |
1 | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
2 | From: Giuseppe Di Natale <dinatale2@users.noreply.github.com> | |
3 | Date: Tue, 20 Feb 2018 16:28:52 -0800 | |
4 | Subject: [PATCH] Correct count_uberblocks in mmp.kshlib | |
5 | MIME-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ||
9 | A log_must call was causing count_uberblocks to return more | |
10 | than just the uberblock count. Remove the log_must since it | |
11 | was only logging a sleep. | |
12 | ||
13 | Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> | |
14 | Reviewed-by: Olaf Faaland <faaland1@llnl.gov> | |
15 | Reviewed-by: loli10K <ezomori.nozomu@gmail.com> | |
16 | Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov> | |
17 | Closes #7191 | |
18 | (cherry picked from commit d5b10b3ef3b5e82b9e5a9bee122f1a0be007dae2) | |
19 | Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> | |
20 | --- | |
21 | tests/zfs-tests/tests/functional/mmp/mmp.kshlib | 2 +- | |
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
23 | ||
24 | diff --git a/tests/zfs-tests/tests/functional/mmp/mmp.kshlib b/tests/zfs-tests/tests/functional/mmp/mmp.kshlib | |
25 | index 4c46ae7a2..1f8d66fd9 100644 | |
26 | --- a/tests/zfs-tests/tests/functional/mmp/mmp.kshlib | |
27 | +++ b/tests/zfs-tests/tests/functional/mmp/mmp.kshlib | |
28 | @@ -198,6 +198,6 @@ function count_uberblocks # pool duration | |
29 | typeset -i duration=$2 | |
30 | typeset hist_path="/proc/spl/kstat/zfs/$pool/multihost" | |
31 | ||
32 | - log_must sleep $duration | |
33 | + sleep $duration | |
34 | echo $(cat "$hist_path" | sed '1,2d' | wc -l) | |
35 | } | |
36 | -- | |
37 | 2.14.2 | |
38 |