From df9e12ca3db5a3f4c3cea84421cd906160ef976a Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 9 Oct 2020 15:29:05 +0000 Subject: [PATCH] Avoid using single quotes in arguments to logger. Single quotes interfere with the workaround put in with r335753 and aren't necessary in this case. I believe that all the underling issues with r335753 have been corrected, but need to do more extensive followup before reverting it as a bad idea. PR: 240411 MFC After: 2 days (to give it time to get into 12.2) --- sbin/devd/zfs.conf | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/sbin/devd/zfs.conf b/sbin/devd/zfs.conf index edabbbf3ed59..ef6a6c12b6a1 100644 --- a/sbin/devd/zfs.conf +++ b/sbin/devd/zfs.conf @@ -5,73 +5,73 @@ notify 10 { match "system" "ZFS"; 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'"; + 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" "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'"; + 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" "ereport.fs.zfs.data"; - action "logger -p local7.warn -t ZFS 'pool I/O failure, zpool=$pool error=$zio_err'"; + action "logger -p local7.warn -t ZFS pool I/O failure, zpool=$pool error=$zio_err"; }; notify 10 { match "system" "ZFS"; match "type" "ereport.fs.zfs.zpool"; - action "logger -p local7.err -t ZFS 'failed to load zpool $pool'"; + action "logger -p local7.err -t ZFS failed to load zpool $pool"; }; notify 10 { match "system" "ZFS"; match "type" "ereport.fs.zfs.vdev\..*"; - action "logger -p local7.err -t ZFS 'vdev problem, zpool=$pool path=$vdev_path type=$type'"; + action "logger -p local7.err -t ZFS vdev problem, zpool=$pool path=$vdev_path type=$type"; }; notify 10 { match "system" "ZFS"; match "type" "ereport.fs.zfs.io_failure"; - action "logger -p local7.alert -t ZFS 'catastrophic pool I/O failure, zpool=$pool'"; + action "logger -p local7.alert -t ZFS catastrophic pool I/O failure, zpool=$pool"; }; notify 10 { match "system" "ZFS"; match "type" "ereport.fs.zfs.probe_failure"; - action "logger -p local7.err -t ZFS 'vdev probe failure, zpool=$pool path=$vdev_path'"; + action "logger -p local7.err -t ZFS vdev probe failure, zpool=$pool path=$vdev_path"; }; notify 10 { match "system" "ZFS"; match "type" "ereport.fs.zfs.log_replay"; - action "logger -p local7.err -t ZFS 'pool log replay failure, zpool=$pool'"; + action "logger -p local7.err -t ZFS pool log replay failure, zpool=$pool"; }; notify 10 { match "system" "ZFS"; match "type" "ereport.fs.zfs.config_cache_write"; - action "logger -p local7.warn -t ZFS 'failed to write zpool.cache, zpool=$pool'"; + action "logger -p local7.warn -t ZFS failed to write zpool.cache, zpool=$pool"; }; notify 10 { match "system" "ZFS"; match "type" "resource.fs.zfs.removed"; - action "logger -p local7.notice -t ZFS 'vdev is removed, pool_guid=$pool_guid vdev_guid=$vdev_guid'"; + action "logger -p local7.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 local7.info -t ZFS 'autoreplace is configured for vdev, pool_guid=$pool_guid vdev_guid=$vdev_guid'"; + action "logger -p local7.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 local7.notice -t ZFS 'vdev state changed, pool_guid=$pool_guid vdev_guid=$vdev_guid'"; + action "logger -p local7.notice -t ZFS vdev state changed, pool_guid=$pool_guid vdev_guid=$vdev_guid"; };