diff options
| -rwxr-xr-x | cmd/zed/zed.d/statechange-led.sh | 23 | ||||
| l--------- | cmd/zed/zed.d/vdev_attach-led.sh | 1 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | module/zfs/zfs_fm.c | 8 |
4 files changed, 15 insertions, 22 deletions
diff --git a/cmd/zed/zed.d/statechange-led.sh b/cmd/zed/zed.d/statechange-led.sh index af1a14a9a..257e4a8a0 100755 --- a/cmd/zed/zed.d/statechange-led.sh +++ b/cmd/zed/zed.d/statechange-led.sh @@ -71,29 +71,12 @@ function led function process { path="$1" fault=$2 - prev=$3 - if [ "$fault" == "FAULTED" ] || [ "$fault" == "DEGRADED" ] ; then - led "$path" 1 - elif [ "$fault" == "UNAVAIL" ] && [ "$prev" != "ONLINE" ] ; then - # For the most part, UNAVAIL should turn on the LED. However, - # during an autoreplace, we see our new drive go online, - # followed by our "old" drive going ONLINE->UNAVAIL. Since the - # "old" drive has the same slot information, we want to ignore - # the ONLINE->UNAVAIL event. - # - # NAME STATE READ WRITE CKSUM - # mypool3 DEGRADED 0 0 0 - # mirror-0 DEGRADED 0 0 0 - # A1 ONLINE 0 0 0 - # A2 ONLINE 0 880 0 - # replacing-3 UNAVAIL 0 0 0 - # old UNAVAIL 0 2.93K 0 corrupted data - # A3 ONLINE 0 0 156 (resilvering) + if [ "$fault" == "FAULTED" ] || [ "$fault" == "DEGRADED" ] || \ + [ "$fault" == "UNAVAIL" ] ; then led "$path" 1 elif [ "$fault" == "ONLINE" ] ; then led "$path" 0 fi } -process "$ZEVENT_VDEV_ENC_SYSFS_PATH" "$ZEVENT_VDEV_STATE_STR" \ - "$ZEVENT_VDEV_LASTSTATE_STR" +process "$ZEVENT_VDEV_ENC_SYSFS_PATH" "$ZEVENT_VDEV_STATE_STR" diff --git a/cmd/zed/zed.d/vdev_attach-led.sh b/cmd/zed/zed.d/vdev_attach-led.sh new file mode 120000 index 000000000..7d7404398 --- /dev/null +++ b/cmd/zed/zed.d/vdev_attach-led.sh @@ -0,0 +1 @@ +statechange-led.sh
\ No newline at end of file diff --git a/configure.ac b/configure.ac index e9f50f783..39bd54c17 100644 --- a/configure.ac +++ b/configure.ac @@ -304,6 +304,7 @@ AC_CONFIG_FILES([ AC_OUTPUT -AS_IF([test "x$user_libdevmapper" != xyes ], [ - AC_MSG_WARN([Building without libdevmapper. Auto-replace, auto-online, and statechange-led.sh may not work correctly with device mapper vdevs.]) +AS_IF([test "x$user_libdevmapper" != xyes && test "$ZFS_CONFIG" != kernel ], [ + AC_MSG_WARN([Building without libdevmapper. Auto-replace, auto-online, \ +and statechange-led.sh may not work correctly with device mapper vdevs.]) ]) diff --git a/module/zfs/zfs_fm.c b/module/zfs/zfs_fm.c index 0f8ac28c1..df37fed2b 100644 --- a/module/zfs/zfs_fm.c +++ b/module/zfs/zfs_fm.c @@ -307,6 +307,10 @@ zfs_ereport_start(nvlist_t **ereport_out, nvlist_t **detector_out, fm_payload_set(ereport, FM_EREPORT_PAYLOAD_ZFS_VDEV_FRU, DATA_TYPE_STRING, vd->vdev_fru, NULL); + if (vd->vdev_enc_sysfs_path != NULL) + fm_payload_set(ereport, + FM_EREPORT_PAYLOAD_ZFS_VDEV_ENC_SYSFS_PATH, + DATA_TYPE_STRING, vd->vdev_enc_sysfs_path, NULL); if (vd->vdev_ashift) fm_payload_set(ereport, FM_EREPORT_PAYLOAD_ZFS_VDEV_ASHIFT, @@ -928,6 +932,10 @@ zfs_post_common(spa_t *spa, vdev_t *vd, const char *type, const char *name, if (vd->vdev_fru != NULL) VERIFY0(nvlist_add_string(resource, FM_EREPORT_PAYLOAD_ZFS_VDEV_FRU, vd->vdev_fru)); + if (vd->vdev_enc_sysfs_path != NULL) + VERIFY0(nvlist_add_string(resource, + FM_EREPORT_PAYLOAD_ZFS_VDEV_ENC_SYSFS_PATH, + vd->vdev_enc_sysfs_path)); /* also copy any optional payload data */ if (aux) { nvpair_t *elem = NULL; |