Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge pull request #2 from don-brady/zfs-2.1.5-v4-zed 

zed no fault
This commit is contained in:
Geoff Amey 2024-09-10 14:30:43 -06:00 committed by GitHub
parent e76d195bcb d09bbdfce0
commit 3b3f342af1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/zed/agents/zfs_retire.c
View File

@ -493,7 +493,14 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
* Actively fault the device if needed. * Actively fault the device if needed.
*/ */
if (fault_device) if (fault_device)
#if 1
/*
* Klara -- don't issue faults
*/
(void) zpool_vdev_degrade(zhp, vdev_guid, aux);
#else
(void) zpool_vdev_fault(zhp, vdev_guid, aux); (void) zpool_vdev_fault(zhp, vdev_guid, aux);
#endif
if (degrade_device) if (degrade_device)
(void) zpool_vdev_degrade(zhp, vdev_guid, aux); (void) zpool_vdev_degrade(zhp, vdev_guid, aux);

2
cmd/zed/zed_conf.c
View File

@ -183,7 +183,7 @@ _zed_conf_display_license(void)
static void static void
_zed_conf_display_version(void) _zed_conf_display_version(void)
{ {
printf("%s-%s-%s\n", printf("%s-%s-%s-skip-faults\n",
ZFS_META_NAME, ZFS_META_VERSION, ZFS_META_RELEASE); ZFS_META_NAME, ZFS_META_VERSION, ZFS_META_RELEASE);
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);