Author: imp
Date: Fri Oct 9 15:29:05 2020
New Revision: 366578
URL: https://svnweb.freebsd.org/changeset/base/366578
Log:
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)
Modified:
head/sbin/devd/zfs.conf
Modified: head/sbin/devd/zfs.conf
==============================================================================
--- head/sbin/devd/zfs.conf Fri Oct 9 15:27:37 2020 (r366577)
+++ head/sbin/devd/zfs.conf Fri Oct 9 15:29:05 2020 (r366578)
@@ -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";
};
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
