From: Olaf Faaland Date: Mon, 13 Aug 2018 15:12:25 +0000 (-0700) Subject: MMP should not suspend pool in ztest X-Git-Tag: zfs-0.8.0~456 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5200237711cf17d7da41dd3a89330328eafb5e87;p=mirror_zfs.git MMP should not suspend pool in ztest When running ztest, never suspend the pool due to failed or delayed MMP writes. There are many sources of long delays within ztest, such as device opens, closes, etc. which in combination, may delay MMP writes too long and cause MMP to suspend the pool. Some of these delays also affect real pools, and should be fixed. That is being worked separately. Reviewed-by: Giuseppe Di Natale Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: Olaf Faaland Closes #7776 --- diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index de3b9848e..8fb6200d5 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -2770,6 +2770,8 @@ ztest_mmp_enable_disable(ztest_ds_t *zd, uint64_t id) spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER); mutex_enter(&spa->spa_props_lock); + zfs_multihost_fail_intervals = 0; + if (!spa_multihost(spa)) { spa->spa_multihost = B_TRUE; mmp_thread_start(spa);