svn commit: r339153 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Alexander Motin mav at FreeBSD.org
Wed Oct 3 15:36:37 UTC 2018


Author: mav
Date: Wed Oct  3 15:36:36 2018
New Revision: 339153
URL: https://svnweb.freebsd.org/changeset/base/339153

Log:
  MFC r338869: MFV r338866: 9700 ZFS resilvered mirror does not balance reads
  
  illumos/illumos-gate at 82f63c3c2bf5e4378706e8dcfccf717d67371be9
  
  Reviewed by: Toomas Soome <tsoome at me.com>
  Reviewed by: Sanjay Nadkarni <sanjay.nadkarni at nexenta.com>
  Reviewed by: George Wilson <george.wilson at delphix.com>
  Approved by: Matthew Ahrens <mahrens at delphix.com>
  Author:     Jerry Jelinek <jerry.jelinek at joyent.com>

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Wed Oct  3 15:35:27 2018	(r339152)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Wed Oct  3 15:36:36 2018	(r339153)
@@ -28,7 +28,7 @@
  * Copyright 2013 Saso Kiselkov. All rights reserved.
  * Copyright (c) 2014 Integros [integros.com]
  * Copyright 2016 Toomas Soome <tsoome at me.com>
- * Copyright 2017 Joyent, Inc.
+ * Copyright 2018 Joyent, Inc.
  * Copyright (c) 2017 Datto Inc.
  * Copyright 2018 OmniOS Community Edition (OmniOSce) Association.
  */
@@ -6871,6 +6871,7 @@ spa_vdev_resilver_done_hunt(vdev_t *vd)
 
 	/*
 	 * Check for a completed resilver with the 'unspare' flag set.
+	 * Also potentially update faulted state.
 	 */
 	if (vd->vdev_ops == &vdev_spare_ops) {
 		vdev_t *first = vd->vdev_child[0];
@@ -6891,6 +6892,8 @@ spa_vdev_resilver_done_hunt(vdev_t *vd)
 		    vdev_dtl_empty(newvd, DTL_OUTAGE) &&
 		    !vdev_dtl_required(oldvd))
 			return (oldvd);
+
+		vdev_propagate_state(vd);
 
 		/*
 		 * If there are more than two spares attached to a disk,


More information about the svn-src-all mailing list