From fb390aafc8338c62115e611dbe1917bbe7435eef Mon Sep 17 00:00:00 2001 From: Hans Rosenfeld Date: Wed, 27 Jul 2016 15:29:15 -0700 Subject: OpenZFS 5997 - FRU field not set during pool creation and never updated Authored by: Hans Rosenfeld Reviewed by: Dan Fields Reviewed by: Josef Sipek Reviewed by: Richard Elling Reviewed by: George Wilson Approved by: Robert Mustacchi Signed-off-by: Don Brady Ported-by: Brian Behlendorf OpenZFS-issue: https://www.illumos.org/issues/5997 OpenZFS-commit: https://github.com/openzfs/openzfs/commit/1437283 Porting Notes: In addition to the OpenZFS changes this patch realigns the events with those found in OpenZFS. Events which would be logged as sysevents on illumos have been been mapped to the 'sysevent' class for Linux. In addition, several subclass names have been changed to match what is used in OpenZFS. In all cases this means a '.' was changed to an '_' in the subclass. The scripts provided by ZoL have been updated, however users which provide scripts for any of the following events will need to rename them based on the new subclass names. ereport.fs.zfs.config.sync sysevent.fs.zfs.config_sync ereport.fs.zfs.zpool.destroy sysevent.fs.zfs.pool_destroy ereport.fs.zfs.zpool.reguid sysevent.fs.zfs.pool_reguid ereport.fs.zfs.vdev.remove sysevent.fs.zfs.vdev_remove ereport.fs.zfs.vdev.clear sysevent.fs.zfs.vdev_clear ereport.fs.zfs.vdev.check sysevent.fs.zfs.vdev_check ereport.fs.zfs.vdev.spare sysevent.fs.zfs.vdev_spare ereport.fs.zfs.vdev.autoexpand sysevent.fs.zfs.vdev_autoexpand ereport.fs.zfs.resilver.start sysevent.fs.zfs.resilver_start ereport.fs.zfs.resilver.finish sysevent.fs.zfs.resilver_finish ereport.fs.zfs.scrub.start sysevent.fs.zfs.scrub_start ereport.fs.zfs.scrub.finish sysevent.fs.zfs.scrub_finish ereport.fs.zfs.bootfs.vdev.attach sysevent.fs.zfs.bootfs_vdev_attach --- include/sys/fm/fs/zfs.h | 19 +++---------------- include/sys/fm/protocol.h | 1 + 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'include/sys/fm') diff --git a/include/sys/fm/fs/zfs.h b/include/sys/fm/fs/zfs.h index 26f400303..ad3f4a79e 100644 --- a/include/sys/fm/fs/zfs.h +++ b/include/sys/fm/fs/zfs.h @@ -36,10 +36,7 @@ extern "C" { #define FM_EREPORT_ZFS_IO "io" #define FM_EREPORT_ZFS_DATA "data" #define FM_EREPORT_ZFS_DELAY "delay" -#define FM_EREPORT_ZFS_CONFIG_SYNC "config.sync" #define FM_EREPORT_ZFS_POOL "zpool" -#define FM_EREPORT_ZFS_POOL_DESTROY "zpool.destroy" -#define FM_EREPORT_ZFS_POOL_REGUID "zpool.reguid" #define FM_EREPORT_ZFS_DEVICE_UNKNOWN "vdev.unknown" #define FM_EREPORT_ZFS_DEVICE_OPEN_FAILED "vdev.open_failed" #define FM_EREPORT_ZFS_DEVICE_CORRUPT_DATA "vdev.corrupt_data" @@ -48,20 +45,10 @@ extern "C" { #define FM_EREPORT_ZFS_DEVICE_TOO_SMALL "vdev.too_small" #define FM_EREPORT_ZFS_DEVICE_BAD_LABEL "vdev.bad_label" #define FM_EREPORT_ZFS_DEVICE_BAD_ASHIFT "vdev.bad_ashift" -#define FM_EREPORT_ZFS_DEVICE_REMOVE "vdev.remove" -#define FM_EREPORT_ZFS_DEVICE_CLEAR "vdev.clear" -#define FM_EREPORT_ZFS_DEVICE_CHECK "vdev.check" -#define FM_EREPORT_ZFS_DEVICE_SPARE "vdev.spare" -#define FM_EREPORT_ZFS_DEVICE_AUTOEXPAND "vdev.autoexpand" #define FM_EREPORT_ZFS_IO_FAILURE "io_failure" #define FM_EREPORT_ZFS_PROBE_FAILURE "probe_failure" #define FM_EREPORT_ZFS_LOG_REPLAY "log_replay" #define FM_EREPORT_ZFS_CONFIG_CACHE_WRITE "config_cache_write" -#define FM_EREPORT_ZFS_RESILVER_START "resilver.start" -#define FM_EREPORT_ZFS_RESILVER_FINISH "resilver.finish" -#define FM_EREPORT_ZFS_SCRUB_START "scrub.start" -#define FM_EREPORT_ZFS_SCRUB_FINISH "scrub.finish" -#define FM_EREPORT_ZFS_BOOTFS_VDEV_ATTACH "bootfs.vdev.attach" #define FM_EREPORT_PAYLOAD_ZFS_POOL "pool" #define FM_EREPORT_PAYLOAD_ZFS_POOL_FAILMODE "pool_failmode" @@ -116,9 +103,9 @@ extern "C" { #define FM_EREPORT_FAILMODE_CONTINUE "continue" #define FM_EREPORT_FAILMODE_PANIC "panic" -#define FM_EREPORT_RESOURCE_REMOVED "removed" -#define FM_EREPORT_RESOURCE_AUTOREPLACE "autoreplace" -#define FM_EREPORT_RESOURCE_STATECHANGE "statechange" +#define FM_RESOURCE_REMOVED "removed" +#define FM_RESOURCE_AUTOREPLACE "autoreplace" +#define FM_RESOURCE_STATECHANGE "statechange" #ifdef __cplusplus } diff --git a/include/sys/fm/protocol.h b/include/sys/fm/protocol.h index de05bb296..33fccdf67 100644 --- a/include/sys/fm/protocol.h +++ b/include/sys/fm/protocol.h @@ -50,6 +50,7 @@ extern "C" { #define FM_RSRC_CLASS "resource" #define FM_LIST_EVENT "list" #define FM_IREPORT_CLASS "ireport" +#define FM_SYSEVENT_CLASS "sysevent" /* FM list.* event class values */ #define FM_LIST_SUSPECT_CLASS FM_LIST_EVENT ".suspect" -- cgit v1.2.3