From c02c1becce96969ea20a2e142dd451cc37d2a9a0 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Mon, 7 May 2018 21:08:33 -0700 Subject: 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 Reviewed-by: Giuseppe Di Natale Reviewed-by: loli10K Signed-off-by: Brian Behlendorf Closes #7514 --- module/zfs/spa.c | 1 + 1 file changed, 1 insertion(+) (limited to 'module/zfs') 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); -- cgit v1.2.3