diff options
| author | Brian Behlendorf <[email protected]> | 2017-10-23 09:45:59 -0700 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2017-12-04 17:21:03 -0800 |
| commit | 954516cec1817b6bd3755292594b8e3562d0156c (patch) | |
| tree | 2e88f7da09482588bda904c4619066086033236c /include/sys | |
| parent | 841cb5ee2ae8f1d617cd1f6713c8394e3bb30127 (diff) | |
Emit history events for 'zpool create'
History commands and events were being suppressed for the
'zpool create' command since the history object did not
yet exist. Create the object earlier so this history
doesn't get lost.
Split the pool_destroy event in to pool_destroy and
pool_export so they may be distinguished.
Updated events_001_pos and events_002_pos test cases. They
now check for the expected history events and were reworked
to be more reliable.
Reviewed-by: Nathaniel Clark <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #6712
Closes #6486
Conflicts:
tests/zfs-tests/tests/functional/events/events_002_pos.ksh
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/spa.h | 3 | ||||
| -rw-r--r-- | include/sys/sysevent/eventdefs.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sys/spa.h b/include/sys/spa.h index de942ad2b..67235871f 100644 --- a/include/sys/spa.h +++ b/include/sys/spa.h @@ -876,7 +876,8 @@ extern int spa_history_get(spa_t *spa, uint64_t *offset, uint64_t *len_read, char *his_buf); extern int spa_history_log(spa_t *spa, const char *his_buf); extern int spa_history_log_nvl(spa_t *spa, nvlist_t *nvl); -extern void spa_history_log_version(spa_t *spa, const char *operation); +extern void spa_history_log_version(spa_t *spa, const char *operation, + dmu_tx_t *tx); extern void spa_history_log_internal(spa_t *spa, const char *operation, dmu_tx_t *tx, const char *fmt, ...); extern void spa_history_log_internal_ds(struct dsl_dataset *ds, const char *op, diff --git a/include/sys/sysevent/eventdefs.h b/include/sys/sysevent/eventdefs.h index fc2687842..825d88a7b 100644 --- a/include/sys/sysevent/eventdefs.h +++ b/include/sys/sysevent/eventdefs.h @@ -101,6 +101,7 @@ extern "C" { #define ESC_ZFS_POOL_CREATE "pool_create" #define ESC_ZFS_POOL_DESTROY "pool_destroy" #define ESC_ZFS_POOL_IMPORT "pool_import" +#define ESC_ZFS_POOL_EXPORT "pool_export" #define ESC_ZFS_VDEV_ADD "vdev_add" #define ESC_ZFS_VDEV_ATTACH "vdev_attach" #define ESC_ZFS_VDEV_CLEAR "vdev_clear" |