diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-30 11:32:30 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-05-30 11:32:30 +0000 |
| commit | 1205f1a47f18f403254c28de55875156744b9e0a (patch) | |
| tree | 9756c8b0e0c83d523cd1223ed503a012a923b22d /usr/src/man/man5 | |
| parent | fd807bef73987a10c8851965bae1f29ababa5f2b (diff) | |
| parent | 4fbfc69b99ccacf0999510e626df37e53b3d56ef (diff) | |
| download | illumos-joyent-1205f1a47f18f403254c28de55875156744b9e0a.tar.gz | |
[illumos-gate merge]
commit 4fbfc69b99ccacf0999510e626df37e53b3d56ef
10991 Allow user ACE in ACL to match SID in token extra SIDs
commit 10a268c1c2abd3fd9cc708870a3020567adeb92c
11067 debug statistics crash ld(1) when -z allextract
commit 0bc0887e1cf0f912077b83256f295ad0ed1c715c
11057 hidden undefined weak symbols should not leave relocations
11058 libld entrance descriptor assertions get NDEBUG check backwards
commit b3b3563308068a7fafd98cf3021c73aedc1caa6c
11060 sys/zone.h exposes more than it should
commit 810e978011ea80127b0a15368276459b566a3241
10989 Ricoh scanner error after DFS get referral
commit a1096253735019dce07e79caf2df1e13078770fb
10988 SMB should not create in directories marked delete-on-close
commit b5b772b09624dfff0e83299d0f7b895129f7bf26
8583 Windows 10 fails to delete read-only files with SMB2
commit 575d359d36700f4571e4a87c94966a99b8b7f48a
10987 SMB1 fails renaming an open file
commit 91ca6bffd299a6eb6fd63dd0ef807bbd6fb4f835
10985 Hitting file handler count limit of 16k
commit e4c795beb33bf59dd4ad2e3f88f493111484b890
10952 defer new resilvers and misc. resilver-related fixes
commit 1b55eab738595803f2f751ac1714f659b2e48b9b
11062 psrinfo: comparison between pointer and integer
commit 80bd8a585c4ef2f19c09c9c4379635e411c91fe6
11063 acl_common.c: error: comparison between pointer and integer
commit 84ce06cea75304aa6dec12e94975d5372dd9c672
11072 Deadlock in lofi after 11043
Conflicts:
usr/src/uts/common/sys/zone.h
Diffstat (limited to 'usr/src/man/man5')
| -rw-r--r-- | usr/src/man/man5/zpool-features.5 | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/usr/src/man/man5/zpool-features.5 b/usr/src/man/man5/zpool-features.5 index 3f83366f0e..ff34ce5d48 100644 --- a/usr/src/man/man5/zpool-features.5 +++ b/usr/src/man/man5/zpool-features.5 @@ -15,7 +15,7 @@ .\" CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your .\" own identifying information: .\" Portions Copyright [yyyy] [name of copyright owner] -.TH ZPOOL-FEATURES 5 "Apr 19, 2019" +.TH ZPOOL-FEATURES 5 "May 15, 2019" .SH NAME zpool\-features \- ZFS pool feature descriptions .SH DESCRIPTION @@ -683,5 +683,26 @@ This feature becomes \fBactive\fR when a dedicated allocation class vdev removal, it can be returned to the \fBenabled\fR state if all the top-level vdevs from an allocation class are removed. +.RE +.sp +.ne 2 +.na +\fB\fBresilver_defer\fR\fR +.ad +.RS 4n +.TS +l l . +GUID com.datto:resilver_defer +READ\-ONLY COMPATIBLE yes +DEPENDENCIES none +.TE + +This feature allows zfs to postpone new resilvers if an existing one is already +in progress. Without this feature, any new resilvers will cause the currently +running one to be immediately restarted from the beginning. + +This feature becomes \fBactive\fR once a resilver has been deferred, and +returns to being \fBenabled\fR when the deferred resilver begins. + .SH "SEE ALSO" \fBzfs\fR(1M), \fBzpool\fR(1M) |