diff options
| author | Olaf Faaland <[email protected]> | 2019-02-28 17:56:19 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-02-28 17:56:19 -0800 |
| commit | 8133679ff00b1a1434460111f1fa71d169575701 (patch) | |
| tree | 62cd594fe020d2700609374be7de77a653aad706 | |
| parent | 4f3218aed8be7e3a6f619b363ccdb6c4bf1bc680 (diff) | |
Do not resume a pool if multihost is enabled
When multihost is enabled, and a pool is suspended, return
EINVAL in response to "zpool clear <pool>". The pool
may have been imported on another host while I/O was suspended.
Reviewed-by: loli10K <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Olaf Faaland <[email protected]>
Closes #6933
Closes #8460
| -rw-r--r-- | cmd/ztest/ztest.c | 7 | ||||
| -rw-r--r-- | man/man8/zpool.8 | 3 | ||||
| -rw-r--r-- | module/zfs/zfs_ioctl.c | 7 |
3 files changed, 17 insertions, 0 deletions
diff --git a/cmd/ztest/ztest.c b/cmd/ztest/ztest.c index adbf60c60..8cc6a6ff9 100644 --- a/cmd/ztest/ztest.c +++ b/cmd/ztest/ztest.c @@ -2763,6 +2763,13 @@ ztest_mmp_enable_disable(ztest_ds_t *zd, uint64_t id) if (zo->zo_mmp_test) return; + /* + * Since enabling MMP involves setting a property, it could not be done + * while the pool is suspended. + */ + if (spa_suspended(spa)) + return; + spa_config_enter(spa, SCL_CONFIG, FTAG, RW_READER); mutex_enter(&spa->spa_props_lock); diff --git a/man/man8/zpool.8 b/man/man8/zpool.8 index 52604c139..42aef91f9 100644 --- a/man/man8/zpool.8 +++ b/man/man8/zpool.8 @@ -1013,6 +1013,9 @@ Clears device errors in a pool. If no arguments are specified, all device errors within the pool are cleared. If one or more devices is specified, only those errors associated with the specified device or devices are cleared. +If multihost is enabled, and the pool has been suspended, this will not +resume I/O. While the pool was suspended, it may have been imported on +another host, and resuming I/O could result in pool damage. .It Xo .Nm .Cm create diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c index f4aea57d4..ab40ae185 100644 --- a/module/zfs/zfs_ioctl.c +++ b/module/zfs/zfs_ioctl.c @@ -5251,6 +5251,13 @@ zfs_ioc_clear(zfs_cmd_t *zc) if (error != 0) return (error); + /* + * If multihost is enabled, resuming I/O is unsafe as another + * host may have imported the pool. + */ + if (spa_multihost(spa) && spa_suspended(spa)) + return (SET_ERROR(EINVAL)); + spa_vdev_state_enter(spa, SCL_NONE); if (zc->zc_guid == 0) { |