From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:06:13 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 17183911; Mon, 14 Oct 2013 23:06:13 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 039862E7D; Mon, 14 Oct 2013 23:06:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9EN6C8I020213; Mon, 14 Oct 2013 23:06:12 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9EN6Cj7020212; Mon, 14 Oct 2013 23:06:12 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142306.r9EN6Cj7020212@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:06:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256471 - projects/zfsd/head/cddl/sbin/zfsd X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Oct 2013 23:06:13 -0000 Author: asomers Date: Mon Oct 14 23:06:12 2013 New Revision: 256471 URL: http://svnweb.freebsd.org/changeset/base/256471 Log: Fix a bug in zfsd: If you pull two drives on a raidz2 pool with at least two available hotspares, only one will be activated. cddl/sbin/zfsd/case_file.cc CaseFile::Replace should return false when zpool_vdev_attach fails. That way, the operation will be reattempted the next time that a config_sync event arrives. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/case_file.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 23:02:05 2013 (r256470) +++ projects/zfsd/head/cddl/sbin/zfsd/case_file.cc Mon Oct 14 23:06:12 2013 (r256471) @@ -972,6 +972,7 @@ CaseFile::Replace(const char* vdev_type, nvlist_t *nvroot, *newvd; zpool_handle_t *zhp; const char* poolname; + bool retval = true; /* Figure out what pool we're working on */ ZpoolList zpl(ZpoolList::ZpoolByGUID, &m_poolGUID); @@ -1023,6 +1024,7 @@ CaseFile::Replace(const char* vdev_type, poolname, VdevGUIDString().c_str(), libzfs_error_action(g_zfsHandle), libzfs_error_description(g_zfsHandle)); + retval = false; } else { syslog(LOG_INFO, "Replacing vdev(%s/%s) with %s\n", poolname, VdevGUIDString().c_str(), @@ -1030,7 +1032,7 @@ CaseFile::Replace(const char* vdev_type, } nvlist_free(nvroot); - return (true); + return (retval); } /* Does the argument event refer to a checksum error? */