Skip to content

Commit

Permalink
Combine data-notify.sh with io-notify.sh
Browse files Browse the repository at this point in the history
The data-notify.sh ZEDLET serves a very similar purpose to
io-notify.sh, namely, to generate a notification in response to a
particular error event.  Initially, data-notify.sh was separated from
io-notify.sh since the "data" zevent does not (as I understand it)
pertain to a specific vdev device.  This stands in contrast to the
"checksum" and "io" zevents (both handled by io-notify.sh) that can
be attributed to a specific vdev.  At the time, it seemed simpler to
handle these two cases in separate scripts.

This commit adds support for the "data" zevent to io-notify.sh, and
symlinks io-notify.sh to data-notify.sh.  It also adds the counts
for vdev_read_errors, vdev_write_errors, and vdev_cksum_errors to
the notification message.

Signed-off-by: Chris Dunlap <[email protected]>
  • Loading branch information
dun authored and behlendorf committed Apr 27, 2015
1 parent 090b191 commit ce119da
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 51 deletions.
45 changes: 0 additions & 45 deletions cmd/zed/zed.d/data-notify.sh

This file was deleted.

1 change: 1 addition & 0 deletions cmd/zed/zed.d/data-notify.sh
21 changes: 15 additions & 6 deletions cmd/zed/zed.d/io-notify.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/sh
#
# Send notification in response to a CHECKSUM or IO error.
# Send notification in response to a CHECKSUM, DATA, or IO error.
#
# Only one notification per ZED_NOTIFY_INTERVAL_SECS will be sent for a given
# class/pool/vdev combination. This protects against spamming the recipient
# should multiple events occur together in time for the same pool/device.
# class/pool/[vdev] combination. This protects against spamming the recipient
# should multiple events occur together in time for the same pool/[vdev].
#
# Exit codes:
# 0: notification sent
Expand All @@ -18,16 +18,16 @@

[ -n "${ZEVENT_POOL}" ] || exit 9
[ -n "${ZEVENT_SUBCLASS}" ] || exit 9
[ -n "${ZEVENT_VDEV_GUID}" ] || exit 9

if [ "${ZEVENT_SUBCLASS}" != "checksum" ] \
&& [ "${ZEVENT_SUBCLASS}" != "data" ] \
&& [ "${ZEVENT_SUBCLASS}" != "io" ]; then
zed_log_err "unsupported event class \"${ZEVENT_SUBCLASS}\""
exit 9
fi

zed_rate_limit "${ZEVENT_POOL};${ZEVENT_VDEV_GUID};${ZEVENT_SUBCLASS};notify" \
|| exit 3
rate_limit_tag="${ZEVENT_POOL};${ZEVENT_VDEV_GUID:-0};${ZEVENT_SUBCLASS};notify"
zed_rate_limit "${rate_limit_tag}" || exit 3

umask 077
note_subject="ZFS ${ZEVENT_SUBCLASS} error for ${ZEVENT_POOL} on $(hostname)"
Expand All @@ -46,6 +46,15 @@ note_pathname="${TMPDIR:="/tmp"}/$(basename -- "$0").${ZEVENT_EID}.$$"
[ -n "${ZEVENT_VDEV_PATH}" ] && echo " vpath: ${ZEVENT_VDEV_PATH}"
[ -n "${ZEVENT_VDEV_GUID}" ] && echo " vguid: ${ZEVENT_VDEV_GUID}"

[ -n "${ZEVENT_VDEV_CKSUM_ERRORS}" ] \
&& echo " cksum: ${ZEVENT_VDEV_CKSUM_ERRORS}"

[ -n "${ZEVENT_VDEV_READ_ERRORS}" ] \
&& echo " read: ${ZEVENT_VDEV_READ_ERRORS}"

[ -n "${ZEVENT_VDEV_WRITE_ERRORS}" ] \
&& echo " write: ${ZEVENT_VDEV_WRITE_ERRORS}"

echo " pool: ${ZEVENT_POOL}"

} > "${note_pathname}"
Expand Down

0 comments on commit ce119da

Please sign in to comment.