svn commit: r256460 - projects/zfsd/head/cddl/sbin/zfsd

[Alan Somers]

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 {
 			/*