From owner-svn-src-projects@FreeBSD.ORG Mon Oct 14 23:59:10 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 954A4AD2; Mon, 14 Oct 2013 23:59:10 +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 83BD9210F; Mon, 14 Oct 2013 23:59:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9ENxAhb046706; Mon, 14 Oct 2013 23:59:10 GMT (envelope-from asomers@svn.freebsd.org) Received: (from asomers@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9ENxAeJ046705; Mon, 14 Oct 2013 23:59:10 GMT (envelope-from asomers@svn.freebsd.org) Message-Id: <201310142359.r9ENxAeJ046705@svn.freebsd.org> From: Alan Somers Date: Mon, 14 Oct 2013 23:59:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256484 - 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:59:10 -0000 Author: asomers Date: Mon Oct 14 23:59:10 2013 New Revision: 256484 URL: http://svnweb.freebsd.org/changeset/base/256484 Log: Reduce zfsd logging. cddl/sbin/zfsd/zfsd_event.cc: Only syslog events for which zfsd takes some action. This preserves the data necessary for diagnosis of customer issues without filling the logs with every ZFS event type the kernel may issue (e.g. scrub status). Submitted by: gibbs Approved by: ken (mentor) Sponsored by: Spectra Logic Corporation Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Modified: projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc ============================================================================== --- projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Mon Oct 14 23:58:52 2013 (r256483) +++ projects/zfsd/head/cddl/sbin/zfsd/zfsd_event.cc Mon Oct 14 23:59:10 2013 (r256484) @@ -266,8 +266,6 @@ ZfsEvent::Process() const CaseFile::ReEvaluateByGuid(PoolGUID(), *this); } - Log(LOG_INFO); - if (Value("type").find("misc.fs.zfs.") == 0) { /* Configuration changes, resilver events, etc. */ ProcessPoolEvent(); @@ -281,6 +279,7 @@ ZfsEvent::Process() const CaseFile *caseFile(CaseFile::Find(PoolGUID(), VdevGUID())); if (caseFile != NULL) { + Log(LOG_INFO); syslog(LOG_INFO, "Evaluating existing case file\n"); caseFile->ReEvaluate(*this); return (false); @@ -293,6 +292,7 @@ ZfsEvent::Process() const stringstream msg; msg << "No replicas available for pool " << poolGUID; msg << ", ignoring"; + Log(LOG_INFO); syslog(LOG_INFO, "%s", msg.str().c_str()); return (false); } @@ -308,6 +308,7 @@ ZfsEvent::Process() const msg << "ZfsEvent::Process: Event for unknown pool "; msg << poolGUID << " "; msg << "queued"; + Log(LOG_INFO); syslog(priority, "%s", msg.str().c_str()); return (true); } @@ -319,19 +320,21 @@ ZfsEvent::Process() const msg << "ZfsEvent::Process: Event for unknown vdev "; msg << VdevGUID() << " "; msg << "queued"; + Log(LOG_INFO); syslog(priority, "%s", msg.str().c_str()); return (true); } Vdev vdev(zpl.front(), vdevConfig); caseFile = &CaseFile::Create(vdev); - if ( caseFile->ReEvaluate(*this) == false) { + if (caseFile->ReEvaluate(*this) == false) { stringstream msg; int priority = LOG_INFO; msg << "ZfsEvent::Process: Unconsumed event for vdev("; msg << zpool_get_name(zpl.front()) << ","; msg << vdev.GUID() << ") "; msg << "queued"; + Log(LOG_INFO); syslog(priority, "%s", msg.str().c_str()); return (true); } @@ -377,6 +380,7 @@ ZfsEvent::ProcessPoolEvent() const /* The pool is destroyed. Discard any open cases */ if (Value("type") == "misc.fs.zfs.pool_destroy") { + Log(LOG_INFO); CaseFile::ReEvaluateByGuid(PoolGUID(), *this); return; } @@ -387,6 +391,7 @@ ZfsEvent::ProcessPoolEvent() const && caseFile->VdevState() < VDEV_STATE_HEALTHY) degradedDevice = true; + Log(LOG_INFO); caseFile->ReEvaluate(*this); } else if (Value("type") == "misc.fs.zfs.resilver_finish") @@ -396,12 +401,15 @@ ZfsEvent::ProcessPoolEvent() const * corresponding casefile. For example, if a damaged pool were * exported, repaired, then reimported. */ + Log(LOG_INFO); CleanupSpares(); } if (Value("type") == "misc.fs.zfs.vdev_remove" && degradedDevice == false) { + /* See if any other cases can make use of this device. */ + Log(LOG_INFO); ZfsDaemon::RequestSystemRescan(); } }