From owner-svn-src-all@freebsd.org Fri Jan 17 04:13:17 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 61C691FFE5C; Fri, 17 Jan 2020 04:13:17 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47zSNF1wJfz41kB; Fri, 17 Jan 2020 04:13:17 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3D3052CB4; Fri, 17 Jan 2020 04:13:17 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00H4DHKZ089907; Fri, 17 Jan 2020 04:13:17 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00H4DHCI089906; Fri, 17 Jan 2020 04:13:17 GMT (envelope-from mav@FreeBSD.org) Message-Id: <202001170413.00H4DHCI089906@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 17 Jan 2020 04:13:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r356825 - stable/12/sbin/devd X-SVN-Group: stable-12 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/12/sbin/devd X-SVN-Commit-Revision: 356825 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jan 2020 04:13:17 -0000 Author: mav Date: Fri Jan 17 04:13:16 2020 New Revision: 356825 URL: https://svnweb.freebsd.org/changeset/base/356825 Log: MFC r355884: Add missing "ereport." prefixes of ZFS events. I was unable to find time when those were working. I think they have been Broken for at least 5 years or even longer. Modified: stable/12/sbin/devd/zfs.conf Directory Properties: stable/12/ (props changed) Modified: stable/12/sbin/devd/zfs.conf ============================================================================== --- stable/12/sbin/devd/zfs.conf Fri Jan 17 04:12:03 2020 (r356824) +++ stable/12/sbin/devd/zfs.conf Fri Jan 17 04:13:16 2020 (r356825) @@ -4,55 +4,55 @@ notify 10 { match "system" "ZFS"; - match "type" "fs.zfs.checksum"; + match "type" "ereport.fs.zfs.checksum"; action "logger -p local7.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"; + match "type" "ereport.fs.zfs.io"; action "logger -p local7.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"; + match "type" "ereport.fs.zfs.data"; action "logger -p local7.warn -t ZFS 'pool I/O failure, zpool=$pool error=$zio_err'"; }; notify 10 { match "system" "ZFS"; - match "type" "fs.zfs.zpool"; + match "type" "ereport.fs.zfs.zpool"; action "logger -p local7.err -t ZFS 'failed to load zpool $pool'"; }; notify 10 { match "system" "ZFS"; - match "type" "fs.zfs.vdev\..*"; + match "type" "ereport.fs.zfs.vdev\..*"; action "logger -p local7.err -t ZFS 'vdev problem, zpool=$pool path=$vdev_path type=$type'"; }; notify 10 { match "system" "ZFS"; - match "type" "fs.zfs.io_failure"; + match "type" "ereport.fs.zfs.io_failure"; action "logger -p local7.alert -t ZFS 'catastrophic pool I/O failure, zpool=$pool'"; }; notify 10 { match "system" "ZFS"; - match "type" "fs.zfs.probe_failure"; + match "type" "ereport.fs.zfs.probe_failure"; action "logger -p local7.err -t ZFS 'vdev probe failure, zpool=$pool path=$vdev_path'"; }; notify 10 { match "system" "ZFS"; - match "type" "fs.zfs.log_replay"; + match "type" "ereport.fs.zfs.log_replay"; action "logger -p local7.err -t ZFS 'pool log replay failure, zpool=$pool'"; }; notify 10 { match "system" "ZFS"; - match "type" "fs.zfs.config_cache_write"; + match "type" "ereport.fs.zfs.config_cache_write"; action "logger -p local7.warn -t ZFS 'failed to write zpool.cache, zpool=$pool'"; };