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

zed no fault

cmd/zed/agents/zfs_retire.c

@@ -493,7 +493,14 @@ zfs_retire_recv(fmd_hdl_t *hdl, fmd_event_t *ep, nvlist_t *nvl,
 		 * Actively fault the device if needed.
 		 */
 		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);
+#endif
 		if (degrade_device)
 			(void) zpool_vdev_degrade(zhp, vdev_guid, aux);
 

cmd/zed/zed_conf.c

@@ -183,7 +183,7 @@ _zed_conf_display_license(void)
 static 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);
 
 	exit(EXIT_SUCCESS);