From e35c5a8265e791d5856ef24e567cde5879844dc5 Mon Sep 17 00:00:00 2001 From: GeLiXin Date: Tue, 9 Aug 2016 17:49:51 +0800 Subject: [PATCH] Fix incorrect pool state after import Import a raidz pool which has a vdev with a bad label, zpool status shows the right state of the dev, but the wrong state of the pool. The pool state should be DEGRADED, not ONLINE. We examine the label in vdev_validate while in spa_load_impl, the bad label can be detected but doesn't propagate its state to the parent. There are other chances to propagate state in the following vdev_load if we failed to load DTL, but our pool is raidz1 which can tolerate a faulted disk. So we lost the last chance to correct the pool state. Propagate the leaf vdev's state to parent if its label was corrupted, as is done elsewhere in vdev_validate. Signed-off-by: GeLiXin Signed-off-by: Brian Behlendorf Signed-off-by: Don Brady Closes #4948 --- module/zfs/vdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/zfs/vdev.c b/module/zfs/vdev.c index d0b45864214b..75f6e5ce11ae 100644 --- a/module/zfs/vdev.c +++ b/module/zfs/vdev.c @@ -1423,7 +1423,7 @@ vdev_validate(vdev_t *vd, boolean_t strict) spa_last_synced_txg(spa) : -1ULL; if ((label = vdev_label_read_config(vd, txg)) == NULL) { - vdev_set_state(vd, B_TRUE, VDEV_STATE_CANT_OPEN, + vdev_set_state(vd, B_FALSE, VDEV_STATE_CANT_OPEN, VDEV_AUX_BAD_LABEL); return (0); }