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

OpenZFS 8959 - Add notifications when a scrub is paused or resumed 

Authored by: Sean Eric Fagan <sef@ixsystems.com>
Reviewed by: Alek Pinchuk <pinchuk.alek@gmail.com>
Reviewed by: Matthew Ahrens <mahrens@delphix.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Approved by: Gordon Ross <gwr@nexenta.com>
Ported-by: Giuseppe Di Natale <dinatale2@llnl.gov>

Porting Notes:
- Brought #defines in eventdefs.h in line with ZFS on Linux format.
- Updated zfs-events.5 with the new events.

OpenZFS-issue: https://www.illumos.org/issues/8959
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/c862b93eea
Closes #7049
This commit is contained in:
Sean Eric Fagan 2017-11-06 15:13:23 -08:00 committed by Brian Behlendorf
parent 3da3488e63
commit 43cb30b3ce
3 changed files with 36 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sys/sysevent/eventdefs.h
View File

@ -110,6 +110,9 @@ extern "C" {
#define ESC_ZFS_CONFIG_SYNC "config_sync"
#define ESC_ZFS_SCRUB_START "scrub_start"
#define ESC_ZFS_SCRUB_FINISH "scrub_finish"
#define ESC_ZFS_SCRUB_ABORT "scrub_abort"
#define ESC_ZFS_SCRUB_RESUME "scrub_resume"
#define ESC_ZFS_SCRUB_PAUSED "scrub_paused"
#define ESC_ZFS_VDEV_SPARE "vdev_spare"
#define ESC_ZFS_VDEV_AUTOEXPAND "vdev_autoexpand"
#define ESC_ZFS_BOOTFS_VDEV_ATTACH "bootfs_vdev_attach"

29
man/man5/zfs-events.5
View File

@ -328,7 +328,34 @@ Issued when a scrub is started on a pool.
\fBscrub.finish\fR
.ad
.RS 12n
Issued when a pool have finished scrubbing.
Issued when a pool has finished scrubbing.
.RE
.sp
.ne 2
.na
\fBscrub.abort\fR
.ad
.RS 12n
Issued when a scrub is aborted on a pool.
.RE
.sp
.ne 2
.na
\fBscrub.resume\fR
.ad
.RS 12n
Issued when a scrub is resumed on a pool.
.RE
.sp
.ne 2
.na
\fBscrub.paused\fR
.ad
.RS 12n
Issued when a scrub is paused on a pool.
.RE
.sp

6
module/zfs/dsl_scan.c
View File

@ -714,8 +714,10 @@ dsl_scan(dsl_pool_t *dp, pool_scan_func_t func)
/* got scrub start cmd, resume paused scrub */
int err = dsl_scrub_set_pause_resume(scn->scn_dp,
POOL_SCRUB_NORMAL);
if (err == 0)
if (err == 0) {
spa_event_notify(spa, NULL, NULL, ESC_ZFS_SCRUB_RESUME);
return (ECANCELED);
}
return (SET_ERROR(err));
}
@ -842,6 +844,7 @@ dsl_scan_cancel_sync(void *arg, dmu_tx_t *tx)
dsl_scan_done(scn, B_FALSE, tx);
dsl_scan_sync_state(scn, tx, SYNC_MANDATORY);
spa_event_notify(scn->scn_dp->dp_spa, NULL, NULL, ESC_ZFS_SCRUB_ABORT);
}
int
@ -886,6 +889,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, SYNC_CACHED);
spa_event_notify(spa, NULL, NULL, ESC_ZFS_SCRUB_PAUSED);
} else {
ASSERT3U(*cmd, ==, POOL_SCRUB_NORMAL);
if (dsl_scan_is_paused_scrub(scn)) {