diff options
| -rw-r--r-- | module/zfs/spa.c | 1 | ||||
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_props.ksh | 13 |
2 files changed, 12 insertions, 2 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); diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_props.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_props.ksh index 90cde544e..6176adf8b 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_props.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_props.ksh @@ -15,6 +15,7 @@ # . $STF_SUITE/include/libtest.shlib +. $STF_SUITE/tests/functional/mmp/mmp.kshlib # # DESCRIPTION: @@ -33,6 +34,7 @@ function cleanup destroy_pool $TESTPOOL destroy_pool $TESTPOOL2 rm -f $DEVICE1 $DEVICE2 + log_must mmp_clear_hostid } function setup_mirror @@ -45,6 +47,10 @@ function setup_mirror log_assert "'zpool split' can set new property values on the new pool" log_onexit cleanup +if [ -e $HOSTID_FILE ]; then + log_unsupported "System has existing $HOSTID_FILE file" +fi + typeset good_props=('comment=text' 'ashift=12' 'multihost=on' 'listsnapshots=on' 'autoexpand=on' 'autoreplace=on' 'dedupditto=1234' 'delegation=off' 'failmode=continue') @@ -57,7 +63,7 @@ DEVICE1="$TEST_BASE_DIR/device-1" DEVICE2="$TEST_BASE_DIR/device-2" # Needed to set multihost=on -zgenhostid +log_must mmp_set_hostid $HOSTID1 # Verify we can set a combination of valid property values on the new pool for prop in "${good_props[@]}" @@ -68,7 +74,10 @@ do log_must zpool split -o $prop $TESTPOOL $TESTPOOL2 log_must zpool import -N -d $TEST_BASE_DIR $TESTPOOL2 log_must test "$(get_pool_prop $propname $TESTPOOL2)" == "$propval" - cleanup + + destroy_pool $TESTPOOL + destroy_pool $TESTPOOL2 + rm -f $DEVICE1 $DEVICE2 done # Verify we cannot set invalid property values |