From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 21:30:02 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 13A092C1; Mon, 14 Oct 2013 21:30:02 +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 DB65E298C; Mon, 14 Oct 2013 21:30:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ELU1EO069595; Mon, 14 Oct 2013 21:30:01 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ELU1a6069589; Mon, 14 Oct 2013 21:30:01 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142130.r9ELU1a6069589@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 21:30:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256460 - 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 21:30:02 -0000 Author: asomers Date: Mon Oct 14 21:30:00 2013 New Revision: 256460 URL: http://svnweb.freebsd.org/changeset/base/256460 Log: Fixed ZfsEvent::ProcessPoolEvent(): it was never getting called, and didn't have the right string for removal events. dev_ctl_event.cc Fixed event strings dev_ctl_event.h Made a function virtual to facilitate unit testing zfsd.cc Fixed a printf format warning in ExtractEvent. Submitted by: alans Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 21:25:07 2013 (r256459) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.cc Mon Oct 14 21:30:00 2013 (r256460) @@ -619,7 +619,7 @@ ZfsEvent::Process() const Log(LOG_INFO); - if (Value("subsystem").find("misc.fs.zfs.") == 0) { + if (Value("type").find("misc.fs.zfs.") == 0) { /* Configuration changes, resilver events, etc. */ ProcessPoolEvent(); return; @@ -721,8 +721,7 @@ ZfsEvent::ProcessPoolEvent() const caseFile->ReEvaluate(*this); } - /* XXX Needs to be changed. */ - if (Value("type") == "ESC_ZFS_vdev_remove" + if (Value("type") == "misc.fs.zfs.vdev_remove" && degradedDevice == false) { /* See if any other cases can make use of this device. */ ZfsDaemon::RequestSystemRescan(); Modified: projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Mon Oct 14 21:25:07 2013 (r256459) +++ projects/zfsd/head/cddl/sbin/zfsd/dev_ctl_event.h Mon Oct 14 21:30:00 2013 (r256460) @@ -493,7 +493,7 @@ protected: /** Deep copy constructor. */ ZfsEvent(const ZfsEvent &src); - void ProcessPoolEvent() const; + virtual void ProcessPoolEvent() const; Guid m_poolGUID; Guid m_vdevGUID; Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 21:25:07 2013 (r256459) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd.cc Mon Oct 14 21:30:00 2013 (r256460) @@ -181,7 +181,7 @@ EventBuffer::ExtractEvent(string &eventS continue; } syslog(LOG_WARNING, "Overran event buffer\n\tm_nextEventOffset" - "=%d\n\tm_parsedLen=%d\n\tm_validLen=%d", + "=%zd\n\tm_parsedLen=%zd\n\tm_validLen=%zd", m_nextEventOffset, m_parsedLen, m_validLen); } else { /*