MFV r319737: 6939 add sysevents to zfs core for commands
illumos/illumos-gate@ce1577b049
ce1577b049
https://www.illumos.org/issues/6939
Originally created https://smartos.org/bugview/OS-4489
sysevents should be fired in the kernel from ZFS whenever a command
is run that is logged in zpool history.
Example output
Terminal 1
root - gz sunos ~ # zfs create zones/foobar
root - gz sunos ~ # zfs set quota=10g zones/foobar
root - gz sunos ~ # zfs destroy zones/foobar
Terminal 2
root - gz sunos ~ # sysevent EC_zfs
nvlist version: 0
date = 2016-04-28T14:50:08.964Z
vendor = SUNW
publisher = zfs
class = EC_zfs
subclass = ESC_ZFS_history_event
pid = 0
data = (embedded nvlist)
nvlist version: 0
pool_name = zones
pool_guid = 0x40c964e8f9a7a694
history_record = (embedded nvlist)
nvlist version: 0
dsname = zones/foobar
dsid = 0x1525
history internal str =
internal_name = create
history txg = 0x4c4ef3
Reviewed by: Patrick Mooney <patrick.mooney@joyent.com>
Reviewed by: Joshua M. Clulow <jmc@joyent.com>
Reviewed by: Josh Wilsdon <jwilsdon@joyent.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Richard Elling <Richard.Elling@RichardElling.com>
Reviewed by: Alan Somers <asomers@gmail.com>
Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Approved by: Matthew Ahrens <mahrens@delphix.com>
Author: Dave Eddy <dave@daveeddy.com>
This commit is contained in:
commit
03618fe74d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=329690
@ -22,6 +22,7 @@
|
||||
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright 2016 Gary Mills
|
||||
* Copyright (c) 2011, 2016 by Delphix. All rights reserved.
|
||||
* Copyright 2017 Joyent, Inc.
|
||||
* Copyright (c) 2017 Datto Inc.
|
||||
*/
|
||||
|
||||
@ -242,9 +243,10 @@ dsl_scan_setup_sync(void *arg, dmu_tx_t *tx)
|
||||
|
||||
if (vdev_resilver_needed(spa->spa_root_vdev,
|
||||
&scn->scn_phys.scn_min_txg, &scn->scn_phys.scn_max_txg)) {
|
||||
spa_event_notify(spa, NULL, ESC_ZFS_RESILVER_START);
|
||||
spa_event_notify(spa, NULL, NULL,
|
||||
ESC_ZFS_RESILVER_START);
|
||||
} else {
|
||||
spa_event_notify(spa, NULL, ESC_ZFS_SCRUB_START);
|
||||
spa_event_notify(spa, NULL, NULL, ESC_ZFS_SCRUB_START);
|
||||
}
|
||||
|
||||
spa->spa_scrub_started = B_TRUE;
|
||||
@ -353,7 +355,8 @@ dsl_scan_done(dsl_scan_t *scn, boolean_t complete, dmu_tx_t *tx)
|
||||
vdev_dtl_reassess(spa->spa_root_vdev, tx->tx_txg,
|
||||
complete ? scn->scn_phys.scn_max_txg : 0, B_TRUE);
|
||||
if (complete) {
|
||||
spa_event_notify(spa, NULL, scn->scn_phys.scn_min_txg ?
|
||||
spa_event_notify(spa, NULL, NULL,
|
||||
scn->scn_phys.scn_min_txg ?
|
||||
ESC_ZFS_RESILVER_FINISH : ESC_ZFS_SCRUB_FINISH);
|
||||
}
|
||||
spa_errlog_rotate(spa);
|
||||
@ -387,7 +390,7 @@ dsl_scan_cancel_sync(void *arg, dmu_tx_t *tx)
|
||||
|
||||
dsl_scan_done(scn, B_FALSE, tx);
|
||||
dsl_scan_sync_state(scn, tx);
|
||||
spa_event_notify(scn->scn_dp->dp_spa, NULL, ESC_ZFS_SCRUB_ABORT);
|
||||
spa_event_notify(scn->scn_dp->dp_spa, NULL, NULL, ESC_ZFS_SCRUB_ABORT);
|
||||
}
|
||||
|
||||
int
|
||||
@ -442,7 +445,7 @@ dsl_scrub_pause_resume_sync(void *arg, dmu_tx_t *tx)
|
||||
spa->spa_scan_pass_scrub_pause = gethrestime_sec();
|
||||
scn->scn_phys.scn_flags |= DSF_SCRUB_PAUSED;
|
||||
dsl_scan_sync_state(scn, tx);
|
||||
spa_event_notify(spa, NULL, ESC_ZFS_SCRUB_PAUSED);
|
||||
spa_event_notify(spa, NULL, NULL, ESC_ZFS_SCRUB_PAUSED);
|
||||
} else {
|
||||
ASSERT3U(*cmd, ==, POOL_SCRUB_NORMAL);
|
||||
if (dsl_scan_is_paused_scrub(scn)) {
|
||||
@ -2015,7 +2018,7 @@ dsl_scan(dsl_pool_t *dp, pool_scan_func_t func)
|
||||
int err = dsl_scrub_set_pause_resume(scn->scn_dp,
|
||||
POOL_SCRUB_NORMAL);
|
||||
if (err == 0) {
|
||||
spa_event_notify(spa, NULL, ESC_ZFS_SCRUB_RESUME);
|
||||
spa_event_notify(spa, NULL, NULL, ESC_ZFS_SCRUB_RESUME);
|
||||
return (ECANCELED);
|
||||
}
|
||||
|
||||
|
@ -28,6 +28,7 @@
|
||||
* Copyright 2013 Saso Kiselkov. All rights reserved.
|
||||
* Copyright (c) 2014 Integros [integros.com]
|
||||
* Copyright 2016 Toomas Soome <tsoome@me.com>
|
||||
* Copyright 2017 Joyent, Inc.
|
||||
* Copyright (c) 2017 Datto Inc.
|
||||
*/
|
||||
|
||||
@ -154,7 +155,8 @@ const zio_taskq_info_t zio_taskqs[ZIO_TYPES][ZIO_TASKQ_TYPES] = {
|
||||
{ ZTI_ONE, ZTI_NULL, ZTI_ONE, ZTI_NULL }, /* IOCTL */
|
||||
};
|
||||
|
||||
static sysevent_t *spa_event_create(spa_t *spa, vdev_t *vd, const char *name);
|
||||
static sysevent_t *spa_event_create(spa_t *spa, vdev_t *vd, nvlist_t *hist_nvl,
|
||||
const char *name);
|
||||
static void spa_event_post(sysevent_t *ev);
|
||||
static void spa_sync_version(void *arg, dmu_tx_t *tx);
|
||||
static void spa_sync_props(void *arg, dmu_tx_t *tx);
|
||||
@ -800,7 +802,7 @@ spa_change_guid(spa_t *spa)
|
||||
|
||||
if (error == 0) {
|
||||
spa_config_sync(spa, B_FALSE, B_TRUE);
|
||||
spa_event_notify(spa, NULL, ESC_ZFS_POOL_REGUID);
|
||||
spa_event_notify(spa, NULL, NULL, ESC_ZFS_POOL_REGUID);
|
||||
}
|
||||
|
||||
mutex_exit(&spa_namespace_lock);
|
||||
@ -1674,7 +1676,7 @@ spa_check_removed(vdev_t *vd)
|
||||
if (vd->vdev_ops->vdev_op_leaf && vdev_is_dead(vd) &&
|
||||
!vd->vdev_ishole) {
|
||||
zfs_post_autoreplace(vd->vdev_spa, vd);
|
||||
spa_event_notify(vd->vdev_spa, vd, ESC_ZFS_VDEV_CHECK);
|
||||
spa_event_notify(vd->vdev_spa, vd, NULL, ESC_ZFS_VDEV_CHECK);
|
||||
}
|
||||
}
|
||||
|
||||
@ -3915,7 +3917,7 @@ spa_create(const char *pool, nvlist_t *nvroot, nvlist_t *props,
|
||||
txg_wait_synced(spa->spa_dsl_pool, txg);
|
||||
|
||||
spa_config_sync(spa, B_FALSE, B_TRUE);
|
||||
spa_event_notify(spa, NULL, ESC_ZFS_POOL_CREATE);
|
||||
spa_event_notify(spa, NULL, NULL, ESC_ZFS_POOL_CREATE);
|
||||
|
||||
spa_history_log_version(spa, "create");
|
||||
|
||||
@ -4387,7 +4389,7 @@ spa_import(const char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags)
|
||||
spa_configfile_set(spa, props, B_FALSE);
|
||||
|
||||
spa_config_sync(spa, B_FALSE, B_TRUE);
|
||||
spa_event_notify(spa, NULL, ESC_ZFS_POOL_IMPORT);
|
||||
spa_event_notify(spa, NULL, NULL, ESC_ZFS_POOL_IMPORT);
|
||||
|
||||
mutex_exit(&spa_namespace_lock);
|
||||
return (0);
|
||||
@ -4520,7 +4522,7 @@ spa_import(const char *pool, nvlist_t *config, nvlist_t *props, uint64_t flags)
|
||||
|
||||
spa_history_log_version(spa, "import");
|
||||
|
||||
spa_event_notify(spa, NULL, ESC_ZFS_POOL_IMPORT);
|
||||
spa_event_notify(spa, NULL, NULL, ESC_ZFS_POOL_IMPORT);
|
||||
|
||||
mutex_exit(&spa_namespace_lock);
|
||||
|
||||
@ -4714,7 +4716,7 @@ spa_export_common(char *pool, int new_state, nvlist_t **oldconfig,
|
||||
}
|
||||
}
|
||||
|
||||
spa_event_notify(spa, NULL, ESC_ZFS_POOL_DESTROY);
|
||||
spa_event_notify(spa, NULL, NULL, ESC_ZFS_POOL_DESTROY);
|
||||
|
||||
if (spa->spa_state != POOL_STATE_UNINITIALIZED) {
|
||||
spa_unload(spa);
|
||||
@ -4869,7 +4871,7 @@ spa_vdev_add(spa_t *spa, nvlist_t *nvroot)
|
||||
|
||||
mutex_enter(&spa_namespace_lock);
|
||||
spa_config_update(spa, SPA_CONFIG_UPDATE_POOL);
|
||||
spa_event_notify(spa, NULL, ESC_ZFS_VDEV_ADD);
|
||||
spa_event_notify(spa, NULL, NULL, ESC_ZFS_VDEV_ADD);
|
||||
mutex_exit(&spa_namespace_lock);
|
||||
|
||||
return (0);
|
||||
@ -5045,7 +5047,7 @@ spa_vdev_attach(spa_t *spa, uint64_t guid, nvlist_t *nvroot, int replacing)
|
||||
|
||||
if (newvd->vdev_isspare) {
|
||||
spa_spare_activate(newvd);
|
||||
spa_event_notify(spa, newvd, ESC_ZFS_VDEV_SPARE);
|
||||
spa_event_notify(spa, newvd, NULL, ESC_ZFS_VDEV_SPARE);
|
||||
}
|
||||
|
||||
oldvdpath = spa_strdup(oldvd->vdev_path);
|
||||
@ -5065,9 +5067,9 @@ spa_vdev_attach(spa_t *spa, uint64_t guid, nvlist_t *nvroot, int replacing)
|
||||
dsl_resilver_restart(spa->spa_dsl_pool, dtl_max_txg);
|
||||
|
||||
if (spa->spa_bootfs)
|
||||
spa_event_notify(spa, newvd, ESC_ZFS_BOOTFS_VDEV_ATTACH);
|
||||
spa_event_notify(spa, newvd, NULL, ESC_ZFS_BOOTFS_VDEV_ATTACH);
|
||||
|
||||
spa_event_notify(spa, newvd, ESC_ZFS_VDEV_ATTACH);
|
||||
spa_event_notify(spa, newvd, NULL, ESC_ZFS_VDEV_ATTACH);
|
||||
|
||||
/*
|
||||
* Commit the config
|
||||
@ -5281,7 +5283,7 @@ spa_vdev_detach(spa_t *spa, uint64_t guid, uint64_t pguid, int replace_done)
|
||||
vd->vdev_detached = B_TRUE;
|
||||
vdev_dirty(tvd, VDD_DTL, vd, txg);
|
||||
|
||||
spa_event_notify(spa, vd, ESC_ZFS_VDEV_REMOVE);
|
||||
spa_event_notify(spa, vd, NULL, ESC_ZFS_VDEV_REMOVE);
|
||||
|
||||
/* hang on to the spa before we release the lock */
|
||||
spa_open_ref(spa, FTAG);
|
||||
@ -5797,7 +5799,8 @@ spa_vdev_remove(spa_t *spa, uint64_t guid, boolean_t unspare)
|
||||
if (vd == NULL || unspare) {
|
||||
if (vd == NULL)
|
||||
vd = spa_lookup_by_guid(spa, guid, B_TRUE);
|
||||
ev = spa_event_create(spa, vd, ESC_ZFS_VDEV_REMOVE_AUX);
|
||||
ev = spa_event_create(spa, vd, NULL,
|
||||
ESC_ZFS_VDEV_REMOVE_AUX);
|
||||
spa_vdev_remove_aux(spa->spa_spares.sav_config,
|
||||
ZPOOL_CONFIG_SPARES, spares, nspares, nv);
|
||||
spa_load_spares(spa);
|
||||
@ -5813,7 +5816,7 @@ spa_vdev_remove(spa_t *spa, uint64_t guid, boolean_t unspare)
|
||||
* Cache devices can always be removed.
|
||||
*/
|
||||
vd = spa_lookup_by_guid(spa, guid, B_TRUE);
|
||||
ev = spa_event_create(spa, vd, ESC_ZFS_VDEV_REMOVE_AUX);
|
||||
ev = spa_event_create(spa, vd, NULL, ESC_ZFS_VDEV_REMOVE_AUX);
|
||||
spa_vdev_remove_aux(spa->spa_l2cache.sav_config,
|
||||
ZPOOL_CONFIG_L2CACHE, l2cache, nl2cache, nv);
|
||||
spa_load_l2cache(spa);
|
||||
@ -5854,7 +5857,7 @@ spa_vdev_remove(spa_t *spa, uint64_t guid, boolean_t unspare)
|
||||
/*
|
||||
* Clean up the vdev namespace.
|
||||
*/
|
||||
ev = spa_event_create(spa, vd, ESC_ZFS_VDEV_REMOVE_DEV);
|
||||
ev = spa_event_create(spa, vd, NULL, ESC_ZFS_VDEV_REMOVE_DEV);
|
||||
spa_vdev_remove_from_namespace(spa, vd);
|
||||
|
||||
} else if (vd != NULL) {
|
||||
@ -7326,7 +7329,7 @@ spa_has_active_shared_spare(spa_t *spa)
|
||||
}
|
||||
|
||||
static sysevent_t *
|
||||
spa_event_create(spa_t *spa, vdev_t *vd, const char *name)
|
||||
spa_event_create(spa_t *spa, vdev_t *vd, nvlist_t *hist_nvl, const char *name)
|
||||
{
|
||||
sysevent_t *ev = NULL;
|
||||
#ifdef _KERNEL
|
||||
@ -7363,6 +7366,10 @@ spa_event_create(spa_t *spa, vdev_t *vd, const char *name)
|
||||
}
|
||||
}
|
||||
|
||||
if (hist_nvl != NULL) {
|
||||
fnvlist_merge((nvlist_t *)attr, hist_nvl);
|
||||
}
|
||||
|
||||
if (sysevent_attach_attributes(ev, attr) != 0)
|
||||
goto done;
|
||||
attr = NULL;
|
||||
@ -7389,12 +7396,12 @@ spa_event_post(sysevent_t *ev)
|
||||
/*
|
||||
* Post a sysevent corresponding to the given event. The 'name' must be one of
|
||||
* the event definitions in sys/sysevent/eventdefs.h. The payload will be
|
||||
* filled in from the spa and (optionally) the vdev. This doesn't do anything
|
||||
* in the userland libzpool, as we don't want consumers to misinterpret ztest
|
||||
* or zdb as real changes.
|
||||
* filled in from the spa and (optionally) the vdev and history nvl. This
|
||||
* doesn't do anything in the userland libzpool, as we don't want consumers to
|
||||
* misinterpret ztest or zdb as real changes.
|
||||
*/
|
||||
void
|
||||
spa_event_notify(spa_t *spa, vdev_t *vd, const char *name)
|
||||
spa_event_notify(spa_t *spa, vdev_t *vd, nvlist_t *hist_nvl, const char *name)
|
||||
{
|
||||
spa_event_post(spa_event_create(spa, vd, name));
|
||||
spa_event_post(spa_event_create(spa, vd, hist_nvl, name));
|
||||
}
|
||||
|
@ -23,6 +23,7 @@
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2011, 2015 by Delphix. All rights reserved.
|
||||
* Copyright 2017 Joyent, Inc.
|
||||
*/
|
||||
|
||||
#include <sys/zfs_context.h>
|
||||
@ -321,7 +322,7 @@ spa_config_sync(spa_t *target, boolean_t removing, boolean_t postsysevent)
|
||||
spa_config_generation++;
|
||||
|
||||
if (postsysevent)
|
||||
spa_event_notify(target, NULL, ESC_ZFS_CONFIG_SYNC);
|
||||
spa_event_notify(target, NULL, NULL, ESC_ZFS_CONFIG_SYNC);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -23,6 +23,7 @@
|
||||
* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2015 by Delphix. All rights reserved.
|
||||
* Copyright (c) 2014 Integros [integros.com]
|
||||
* Copyright 2017 Joyent, Inc.
|
||||
*/
|
||||
|
||||
#include <sys/spa.h>
|
||||
@ -190,6 +191,71 @@ spa_history_zone(void)
|
||||
return (NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Post a history sysevent.
|
||||
*
|
||||
* The nvlist_t* passed into this function will be transformed into a new
|
||||
* nvlist where:
|
||||
*
|
||||
* 1. Nested nvlists will be flattened to a single level
|
||||
* 2. Keys will have their names normalized (to remove any problematic
|
||||
* characters, such as whitespace)
|
||||
*
|
||||
* The nvlist_t passed into this function will duplicated and should be freed
|
||||
* by caller.
|
||||
*
|
||||
*/
|
||||
static void
|
||||
spa_history_log_notify(spa_t *spa, nvlist_t *nvl)
|
||||
{
|
||||
nvlist_t *hist_nvl = fnvlist_alloc();
|
||||
uint64_t uint64;
|
||||
char *string;
|
||||
|
||||
if (nvlist_lookup_string(nvl, ZPOOL_HIST_CMD, &string) == 0)
|
||||
fnvlist_add_string(hist_nvl, ZFS_EV_HIST_CMD, string);
|
||||
|
||||
if (nvlist_lookup_string(nvl, ZPOOL_HIST_INT_NAME, &string) == 0)
|
||||
fnvlist_add_string(hist_nvl, ZFS_EV_HIST_INT_NAME, string);
|
||||
|
||||
if (nvlist_lookup_string(nvl, ZPOOL_HIST_ZONE, &string) == 0)
|
||||
fnvlist_add_string(hist_nvl, ZFS_EV_HIST_ZONE, string);
|
||||
|
||||
if (nvlist_lookup_string(nvl, ZPOOL_HIST_HOST, &string) == 0)
|
||||
fnvlist_add_string(hist_nvl, ZFS_EV_HIST_HOST, string);
|
||||
|
||||
if (nvlist_lookup_string(nvl, ZPOOL_HIST_DSNAME, &string) == 0)
|
||||
fnvlist_add_string(hist_nvl, ZFS_EV_HIST_DSNAME, string);
|
||||
|
||||
if (nvlist_lookup_string(nvl, ZPOOL_HIST_INT_STR, &string) == 0)
|
||||
fnvlist_add_string(hist_nvl, ZFS_EV_HIST_INT_STR, string);
|
||||
|
||||
if (nvlist_lookup_string(nvl, ZPOOL_HIST_IOCTL, &string) == 0)
|
||||
fnvlist_add_string(hist_nvl, ZFS_EV_HIST_IOCTL, string);
|
||||
|
||||
if (nvlist_lookup_string(nvl, ZPOOL_HIST_INT_NAME, &string) == 0)
|
||||
fnvlist_add_string(hist_nvl, ZFS_EV_HIST_INT_NAME, string);
|
||||
|
||||
if (nvlist_lookup_uint64(nvl, ZPOOL_HIST_DSID, &uint64) == 0)
|
||||
fnvlist_add_uint64(hist_nvl, ZFS_EV_HIST_DSID, uint64);
|
||||
|
||||
if (nvlist_lookup_uint64(nvl, ZPOOL_HIST_TXG, &uint64) == 0)
|
||||
fnvlist_add_uint64(hist_nvl, ZFS_EV_HIST_TXG, uint64);
|
||||
|
||||
if (nvlist_lookup_uint64(nvl, ZPOOL_HIST_TIME, &uint64) == 0)
|
||||
fnvlist_add_uint64(hist_nvl, ZFS_EV_HIST_TIME, uint64);
|
||||
|
||||
if (nvlist_lookup_uint64(nvl, ZPOOL_HIST_WHO, &uint64) == 0)
|
||||
fnvlist_add_uint64(hist_nvl, ZFS_EV_HIST_WHO, uint64);
|
||||
|
||||
if (nvlist_lookup_uint64(nvl, ZPOOL_HIST_INT_EVENT, &uint64) == 0)
|
||||
fnvlist_add_uint64(hist_nvl, ZFS_EV_HIST_INT_EVENT, uint64);
|
||||
|
||||
spa_event_notify(spa, NULL, hist_nvl, ESC_ZFS_HISTORY_EVENT);
|
||||
|
||||
nvlist_free(hist_nvl);
|
||||
}
|
||||
|
||||
/*
|
||||
* Write out a history event.
|
||||
*/
|
||||
@ -254,6 +320,22 @@ spa_history_log_sync(void *arg, dmu_tx_t *tx)
|
||||
fnvlist_lookup_string(nvl, ZPOOL_HIST_INT_NAME),
|
||||
fnvlist_lookup_string(nvl, ZPOOL_HIST_INT_STR));
|
||||
}
|
||||
/*
|
||||
* The history sysevent is posted only for internal history
|
||||
* messages to show what has happened, not how it happened. For
|
||||
* example, the following command:
|
||||
*
|
||||
* # zfs destroy -r tank/foo
|
||||
*
|
||||
* will result in one sysevent posted per dataset that is
|
||||
* destroyed as a result of the command - which could be more
|
||||
* than one event in total. By contrast, if the sysevent was
|
||||
* posted as a result of the ZPOOL_HIST_CMD key being present
|
||||
* it would result in only one sysevent being posted with the
|
||||
* full command line arguments, requiring the consumer to know
|
||||
* how to parse and understand zfs(1M) command invocations.
|
||||
*/
|
||||
spa_history_log_notify(spa, nvl);
|
||||
} else if (nvlist_exists(nvl, ZPOOL_HIST_IOCTL)) {
|
||||
zfs_dbgmsg("ioctl %s",
|
||||
fnvlist_lookup_string(nvl, ZPOOL_HIST_IOCTL));
|
||||
|
@ -25,6 +25,7 @@
|
||||
* Copyright (c) 2014 Spectra Logic Corporation, All rights reserved.
|
||||
* Copyright 2013 Saso Kiselkov. All rights reserved.
|
||||
* Copyright (c) 2014 Integros [integros.com]
|
||||
* Copyright 2017 Joyent, Inc.
|
||||
* Copyright (c) 2017 Datto Inc.
|
||||
*/
|
||||
|
||||
@ -898,7 +899,8 @@ extern void spa_prop_clear_bootfs(spa_t *spa, uint64_t obj, dmu_tx_t *tx);
|
||||
extern void spa_configfile_set(spa_t *, nvlist_t *, boolean_t);
|
||||
|
||||
/* asynchronous event notification */
|
||||
extern void spa_event_notify(spa_t *spa, vdev_t *vdev, const char *name);
|
||||
extern void spa_event_notify(spa_t *spa, vdev_t *vdev, nvlist_t *hist_nvl,
|
||||
const char *name);
|
||||
|
||||
#ifdef ZFS_DEBUG
|
||||
#define dprintf_bp(bp, fmt, ...) do { \
|
||||
|
@ -26,6 +26,7 @@
|
||||
* Copyright 2013 Martin Matuska <mm@FreeBSD.org>. All rights reserved.
|
||||
* Copyright (c) 2014 Integros [integros.com]
|
||||
* Copyright 2016 Toomas Soome <tsoome@me.com>
|
||||
* Copyright 2017 Joyent, Inc.
|
||||
*/
|
||||
|
||||
#include <sys/zfs_context.h>
|
||||
@ -2652,7 +2653,7 @@ vdev_online(spa_t *spa, uint64_t guid, uint64_t flags, vdev_state_t *newstate)
|
||||
if (wasoffline ||
|
||||
(oldstate < VDEV_STATE_DEGRADED &&
|
||||
vd->vdev_state >= VDEV_STATE_DEGRADED))
|
||||
spa_event_notify(spa, vd, ESC_ZFS_VDEV_ONLINE);
|
||||
spa_event_notify(spa, vd, NULL, ESC_ZFS_VDEV_ONLINE);
|
||||
|
||||
return (spa_vdev_state_exit(spa, vd, 0));
|
||||
}
|
||||
@ -2823,7 +2824,7 @@ vdev_clear(spa_t *spa, vdev_t *vd)
|
||||
if (vd->vdev_aux == NULL && !vdev_is_dead(vd))
|
||||
spa_async_request(spa, SPA_ASYNC_RESILVER);
|
||||
|
||||
spa_event_notify(spa, vd, ESC_ZFS_VDEV_CLEAR);
|
||||
spa_event_notify(spa, vd, NULL, ESC_ZFS_VDEV_CLEAR);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -23,9 +23,9 @@
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2016 by Delphix. All rights reserved.
|
||||
* Copyright 2011 Nexenta Systems, Inc. All rights reserved.
|
||||
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
|
||||
* Copyright (c) 2012, Martin Matuska <mm@FreeBSD.org>. All rights reserved.
|
||||
* Copyright (c) 2014 Integros [integros.com]
|
||||
* Copyright 2017 Joyent, Inc.
|
||||
* Copyright (c) 2017 Datto Inc.
|
||||
*/
|
||||
|
||||
@ -1019,11 +1019,45 @@ typedef enum {
|
||||
* ZFS_EV_POOL_GUID DATA_TYPE_UINT64
|
||||
* ZFS_EV_VDEV_PATH DATA_TYPE_STRING (optional)
|
||||
* ZFS_EV_VDEV_GUID DATA_TYPE_UINT64
|
||||
*
|
||||
* ESC_ZFS_HISTORY_EVENT
|
||||
*
|
||||
* ZFS_EV_POOL_NAME DATA_TYPE_STRING
|
||||
* ZFS_EV_POOL_GUID DATA_TYPE_UINT64
|
||||
* ZFS_EV_HIST_TIME DATA_TYPE_UINT64 (optional)
|
||||
* ZFS_EV_HIST_CMD DATA_TYPE_STRING (optional)
|
||||
* ZFS_EV_HIST_WHO DATA_TYPE_UINT64 (optional)
|
||||
* ZFS_EV_HIST_ZONE DATA_TYPE_STRING (optional)
|
||||
* ZFS_EV_HIST_HOST DATA_TYPE_STRING (optional)
|
||||
* ZFS_EV_HIST_TXG DATA_TYPE_UINT64 (optional)
|
||||
* ZFS_EV_HIST_INT_EVENT DATA_TYPE_UINT64 (optional)
|
||||
* ZFS_EV_HIST_INT_STR DATA_TYPE_STRING (optional)
|
||||
* ZFS_EV_HIST_INT_NAME DATA_TYPE_STRING (optional)
|
||||
* ZFS_EV_HIST_IOCTL DATA_TYPE_STRING (optional)
|
||||
* ZFS_EV_HIST_DSNAME DATA_TYPE_STRING (optional)
|
||||
* ZFS_EV_HIST_DSID DATA_TYPE_UINT64 (optional)
|
||||
*
|
||||
* The ZFS_EV_HIST_* members will correspond to the ZPOOL_HIST_* members in the
|
||||
* history log nvlist. The keynames will be free of any spaces or other
|
||||
* characters that could be potentially unexpected to consumers of the
|
||||
* sysevents.
|
||||
*/
|
||||
#define ZFS_EV_POOL_NAME "pool_name"
|
||||
#define ZFS_EV_POOL_GUID "pool_guid"
|
||||
#define ZFS_EV_VDEV_PATH "vdev_path"
|
||||
#define ZFS_EV_VDEV_GUID "vdev_guid"
|
||||
#define ZFS_EV_HIST_TIME "history_time"
|
||||
#define ZFS_EV_HIST_CMD "history_command"
|
||||
#define ZFS_EV_HIST_WHO "history_who"
|
||||
#define ZFS_EV_HIST_ZONE "history_zone"
|
||||
#define ZFS_EV_HIST_HOST "history_hostname"
|
||||
#define ZFS_EV_HIST_TXG "history_txg"
|
||||
#define ZFS_EV_HIST_INT_EVENT "history_internal_event"
|
||||
#define ZFS_EV_HIST_INT_STR "history_internal_str"
|
||||
#define ZFS_EV_HIST_INT_NAME "history_internal_name"
|
||||
#define ZFS_EV_HIST_IOCTL "history_ioctl"
|
||||
#define ZFS_EV_HIST_DSNAME "history_dsname"
|
||||
#define ZFS_EV_HIST_DSID "history_dsid"
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
@ -22,6 +22,7 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright 2016 Nexenta Systems, Inc.
|
||||
* Copyright 2017 Joyent, Inc.
|
||||
*/
|
||||
|
||||
#ifndef _SYS_SYSEVENT_EVENTDEFS_H
|
||||
@ -208,6 +209,7 @@ extern "C" {
|
||||
#define ESC_ZFS_VDEV_SPARE "ESC_ZFS_vdev_spare"
|
||||
#define ESC_ZFS_BOOTFS_VDEV_ATTACH "ESC_ZFS_bootfs_vdev_attach"
|
||||
#define ESC_ZFS_POOL_REGUID "ESC_ZFS_pool_reguid"
|
||||
#define ESC_ZFS_HISTORY_EVENT "ESC_ZFS_history_event"
|
||||
#define ESC_ZFS_VDEV_AUTOEXPAND "ESC_ZFS_vdev_autoexpand"
|
||||
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user