Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 7 Oct 2014 13:30:43 +0000 (UTC)
From:      Andriy Gapon <avg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r272694 - in stable/9/etc: . devd
Message-ID:  <201410071330.s97DUhB2088258@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: avg
Date: Tue Oct  7 13:30:42 2014
New Revision: 272694
URL: https://svnweb.freebsd.org/changeset/base/272694

Log:
  MFC r261894: move devd rules for zfs events into a separate file
  
  ... and fix stale event types

Added:
  stable/9/etc/devd/zfs.conf
     - copied unchanged from r261894, head/etc/devd/zfs.conf
Modified:
  stable/9/etc/devd.conf
  stable/9/etc/devd/Makefile
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/devd.conf
==============================================================================
--- stable/9/etc/devd.conf	Tue Oct  7 13:30:15 2014	(r272693)
+++ stable/9/etc/devd.conf	Tue Oct  7 13:30:42 2014	(r272694)
@@ -246,37 +246,6 @@ notify 10 {
 	action "logger -p kern.emerg 'WARNING: system temperature too high, shutting down soon!'";
 };
 
-# Sample ZFS problem reports handling.
-notify 10 {
-	match "system"		"ZFS";
-	match "type"		"zpool";
-	action "logger -p kern.err 'ZFS: failed to load zpool $pool'";
-};
-
-notify 10 {
-	match "system"		"ZFS";
-	match "type"		"vdev";
-	action "logger -p kern.err 'ZFS: vdev failure, zpool=$pool type=$type'";
-};
-
-notify 10 {
-	match "system"		"ZFS";
-	match "type"		"data";
-	action "logger -p kern.warn 'ZFS: zpool I/O failure, zpool=$pool error=$zio_err'";
-};
-
-notify 10 {
-	match "system"		"ZFS";
-	match "type"		"io";
-	action "logger -p kern.warn 'ZFS: vdev I/O failure, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size error=$zio_err'";
-};
-
-notify 10 {
-	match "system"		"ZFS";
-	match "type"		"checksum";
-	action "logger -p kern.warn 'ZFS: checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'";
-};
-
 # User requested suspend, so perform preparation steps and then execute
 # the actual suspend process.
 notify 10 {

Modified: stable/9/etc/devd/Makefile
==============================================================================
--- stable/9/etc/devd/Makefile	Tue Oct  7 13:30:15 2014	(r272693)
+++ stable/9/etc/devd/Makefile	Tue Oct  7 13:30:42 2014	(r272694)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-FILES=	uath.conf usb.conf
+FILES=	uath.conf usb.conf zfs.conf
 
 .if ${MACHINE} == "powerpc"
 FILES+=	apple.conf

Copied: stable/9/etc/devd/zfs.conf (from r261894, head/etc/devd/zfs.conf)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/9/etc/devd/zfs.conf	Tue Oct  7 13:30:42 2014	(r272694, copy of r261894, head/etc/devd/zfs.conf)
@@ -0,0 +1,77 @@
+# $FreeBSD$
+#
+# Sample ZFS problem reports handling.
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"fs.zfs.checksum";
+	action "logger -p kern.warn -t ZFS 'checksum mismatch, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size'";
+};
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"fs.zfs.io";
+	action "logger -p kern.warn -t ZFS 'vdev I/O failure, zpool=$pool path=$vdev_path offset=$zio_offset size=$zio_size error=$zio_err'";
+};
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"fs.zfs.data";
+	action "logger -p kern.warn -t ZFS 'pool I/O failure, zpool=$pool error=$zio_err'";
+};
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"fs.zfs.zpool";
+	action "logger -p kern.err -t ZFS 'failed to load zpool $pool'";
+};
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"fs.zfs.vdev\..*";
+	action "logger -p kern.err -t ZFS 'vdev problem, zpool=$pool path=$vdev_path type=$type'";
+};
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"fs.zfs.io_failure";
+	action "logger -p kern.alert -t ZFS 'catastrophic pool I/O failure, zpool=$pool'";
+};
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"fs.zfs.probe_failure";
+	action "logger -p kern.err -t ZFS 'vdev probe failure, zpool=$pool path=$vdev_path'";
+};
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"fs.zfs.log_replay";
+	action "logger -p kern.err -t ZFS 'pool log replay failure, zpool=$pool'";
+};
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"fs.zfs.config_cache_write";
+	action "logger -p kern.warn -t ZFS 'failed to write zpool.cache, zpool=$pool'";
+};
+
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"resource.fs.zfs.removed";
+	action "logger -p kern.notice -t ZFS 'vdev is removed, pool_guid=$pool_guid vdev_guid=$vdev_guid'";
+};
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"resource.fs.zfs.autoreplace";
+	action "logger -p kern.info -t ZFS 'autoreplace is configured for vdev, pool_guid=$pool_guid vdev_guid=$vdev_guid'";
+};
+
+notify 10 {
+	match "system"		"ZFS";
+	match "type"		"resource.fs.zfs.statechange";
+	action "logger -p kern.notice -t ZFS 'vdev state changed, pool_guid=$pool_guid vdev_guid=$vdev_guid'";
+};
+



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410071330.s97DUhB2088258>