diff options
| author | Brian Behlendorf <[email protected]> | 2018-05-07 21:08:33 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-05-07 21:08:33 -0700 |
| commit | c02c1becce96969ea20a2e142dd451cc37d2a9a0 (patch) | |
| tree | a4eeacb9d8e5b1e09bd1c8be122198e3e6387ef4 /module/zfs | |
| parent | a82a4a15be9559b20ec8e8df1430fc4c901d0b69 (diff) | |
ZTS: Re-enable MMP tests
Commit 7fab6361 inadvertently disabled the MMP test cases by creating
and not removing an /etc/hostid file in the new zpool_split_props test
case. When the file exists the ZTS skips the entire MMP test group
rather than modify what may be a system which is already configured.
Update the test case to remove the file.
Additionally, because the MMP tests were disabled a regression slipped
in as part of commit 9eb7b46ed0. Fix it.
Reviewed-by: Tim Chase <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: loli10K <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #7514
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/spa.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/module/zfs/spa.c b/module/zfs/spa.c index 3b5582624..2309116df 100644 --- a/module/zfs/spa.c +++ b/module/zfs/spa.c @@ -3180,6 +3180,7 @@ spa_ld_get_props(spa_t *spa) spa_prop_find(spa, ZPOOL_PROP_DELEGATION, &spa->spa_delegation); spa_prop_find(spa, ZPOOL_PROP_FAILUREMODE, &spa->spa_failmode); spa_prop_find(spa, ZPOOL_PROP_AUTOEXPAND, &spa->spa_autoexpand); + spa_prop_find(spa, ZPOOL_PROP_MULTIHOST, &spa->spa_multihost); spa_prop_find(spa, ZPOOL_PROP_DEDUPDITTO, &spa->spa_dedup_ditto); |