diff options
author | Olaf Faaland <[email protected]> | 2017-09-23 09:28:18 -0700 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2017-09-23 09:28:18 -0700 |
commit | b33d668ddb005b1072c26d36e1abff53aa39ca98 (patch) | |
tree | 710f0a05c14735f2e163ac770164a1e6de3e182b /cmd/ztest | |
parent | 7a6acb31b7a5bcc27a9b0313e46c411d2af353db (diff) |
Fix ZTS MMP tests and ztest -M behavior
Quote "$MMP_IMPORT_MSG" when it is passed as an argument, as it is a
multi-word string. Some tests were passing when they should not have,
because the grep was only testing for the first word.
Correct the message expected when no hostid is set and the test attempts
to enable multihost. It did not match the actual output in that
situation.
Disable ztest_reguid() when ztest is invoked with the -M option. If
ztest performs a reguid, a concurrent import attempt may fail with the
error "one or more devices is currently unavailable" if the guid sum is
calculated on the original device guids but compared against the guid
sum ztest wrote based on the new device guids.
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Olaf Faaland <[email protected]>
Closes #6666
Diffstat (limited to 'cmd/ztest')
-rw-r--r-- | cmd/ztest/ztest.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index 8ea263dea..5aa0c85f3 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -5669,6 +5669,9 @@ ztest_reguid(ztest_ds_t *zd, uint64_t id) uint64_t orig, load; int error; + if (ztest_opts.zo_mmp_test) + return; + orig = spa_guid(spa); load = spa_load_guid(spa); |