fix up r354804, resolve merge conflicts in zpool.8
Somehow I managed to commit the manual page with unresolved conflicts in it. While here, I also replaced .sp with .Pp. MFC after: 3 weeks X-MFC with: r354804
This commit is contained in:
parent
4ddce76706
commit
54d1762459
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=354885
@ -829,13 +829,13 @@ When a pool is determined to be active it cannot be imported, even with the
|
|||||||
option.
|
option.
|
||||||
This property is intended to be used in failover configurations
|
This property is intended to be used in failover configurations
|
||||||
where multiple hosts have access to a pool on shared storage.
|
where multiple hosts have access to a pool on shared storage.
|
||||||
.sp
|
.Pp
|
||||||
Multihost provides protection on import only.
|
Multihost provides protection on import only.
|
||||||
It does not protect against an
|
It does not protect against an
|
||||||
individual device being used in multiple pools, regardless of the type of vdev.
|
individual device being used in multiple pools, regardless of the type of vdev.
|
||||||
See the discussion under
|
See the discussion under
|
||||||
.Sy zpool create.
|
.Sy zpool create.
|
||||||
.sp
|
.Pp
|
||||||
When this property is on, periodic writes to storage occur to show the pool is
|
When this property is on, periodic writes to storage occur to show the pool is
|
||||||
in use.
|
in use.
|
||||||
See
|
See
|
||||||
@ -975,9 +975,14 @@ Discards an existing checkpoint from
|
|||||||
.Op Ar device
|
.Op Ar device
|
||||||
.Xc
|
.Xc
|
||||||
.Pp
|
.Pp
|
||||||
Clears device errors in a pool. If no arguments are specified, all device
|
Clears device errors in a pool.
|
||||||
errors within the pool are cleared. If one or more devices is specified, only
|
If no arguments are specified, all device errors within the pool are cleared.
|
||||||
those errors associated with the specified device or devices are cleared.
|
If one or more devices is specified, only those errors associated with the
|
||||||
|
specified device or devices are cleared.
|
||||||
|
If multihost is enabled, and the pool has been suspended, this will not
|
||||||
|
resume I/O.
|
||||||
|
While the pool was suspended, it may have been imported on
|
||||||
|
another host, and resuming I/O could result in pool damage.
|
||||||
.Bl -tag -width indent
|
.Bl -tag -width indent
|
||||||
.It Fl F
|
.It Fl F
|
||||||
Initiates recovery mode for an unopenable pool. Attempts to discard the last
|
Initiates recovery mode for an unopenable pool. Attempts to discard the last
|
||||||
@ -988,22 +993,8 @@ discarded transactions is irretrievably lost.
|
|||||||
Used in combination with the
|
Used in combination with the
|
||||||
.Fl F
|
.Fl F
|
||||||
flag. Check whether discarding transactions would make the pool openable, but
|
flag. Check whether discarding transactions would make the pool openable, but
|
||||||
<<<<<<<
|
|
||||||
do not actually discard any transactions.
|
do not actually discard any transactions.
|
||||||
.El
|
.El
|
||||||
|||||||
|
|
||||||
If no arguments are specified, all device errors within the pool are cleared.
|
|
||||||
If one or more devices is specified, only those errors associated with the
|
|
||||||
specified device or devices are cleared.
|
|
||||||
=======
|
|
||||||
If no arguments are specified, all device errors within the pool are cleared.
|
|
||||||
If one or more devices is specified, only those errors associated with the
|
|
||||||
specified device or devices are cleared.
|
|
||||||
If multihost is enabled, and the pool has been suspended, this will not
|
|
||||||
resume I/O.
|
|
||||||
While the pool was suspended, it may have been imported on
|
|
||||||
another host, and resuming I/O could result in pool damage.
|
|
||||||
>>>>>>>
|
|
||||||
.It Xo
|
.It Xo
|
||||||
.Nm
|
.Nm
|
||||||
.Cm create
|
.Cm create
|
||||||
@ -1028,15 +1019,6 @@ specification is described in the
|
|||||||
.Qq Sx Virtual Devices
|
.Qq Sx Virtual Devices
|
||||||
section.
|
section.
|
||||||
.Pp
|
.Pp
|
||||||
<<<<<<<
|
|
||||||
The command verifies that each device specified is accessible and not currently
|
|
||||||
|||||||
|
|
||||||
The command verifies that each device specified is accessible and not currently
|
|
||||||
in use by another subsystem.
|
|
||||||
There are some uses, such as being currently mounted, or specified as the
|
|
||||||
dedicated dump device, that prevents a device from ever being used by ZFS.
|
|
||||||
Other uses, such as having a preexisting UFS file system, can be overridden with
|
|
||||||
=======
|
|
||||||
The command attempts to verify that each device specified is accessible and not
|
The command attempts to verify that each device specified is accessible and not
|
||||||
currently in use by another subsystem.
|
currently in use by another subsystem.
|
||||||
However this check is not robust enough
|
However this check is not robust enough
|
||||||
@ -1054,18 +1036,11 @@ or
|
|||||||
do not refer to the same device.
|
do not refer to the same device.
|
||||||
Using the same device in two pools will
|
Using the same device in two pools will
|
||||||
result in pool corruption.
|
result in pool corruption.
|
||||||
.sp
|
.Pp
|
||||||
There are some uses, such as being currently mounted, or specified as the
|
There are some uses, such as being currently mounted, or specified as the
|
||||||
dedicated dump device, that prevents a device from ever being used by ZFS.
|
dedicated dump device, that prevents a device from ever being used by ZFS.
|
||||||
Other uses, such as having a preexisting UFS file system, can be overridden with
|
Other uses, such as having a preexisting UFS file system, can be overridden
|
||||||
>>>>>>>
|
with the
|
||||||
in use by another subsystem. There are some uses, such as being currently
|
|
||||||
mounted, or specified as the dedicated dump device, that prevents a device from
|
|
||||||
ever being used by
|
|
||||||
.Tn ZFS
|
|
||||||
Other uses, such as having a preexisting
|
|
||||||
.Sy UFS
|
|
||||||
file system, can be overridden with the
|
|
||||||
.Fl f
|
.Fl f
|
||||||
option.
|
option.
|
||||||
.Pp
|
.Pp
|
||||||
@ -1720,7 +1695,7 @@ devices in this pool are online and healthy before performing this action.
|
|||||||
Removes the specified device from the pool.
|
Removes the specified device from the pool.
|
||||||
This command currently only supports removing hot spares, cache, log
|
This command currently only supports removing hot spares, cache, log
|
||||||
devices and mirrored top-level vdevs (mirror of leaf devices); but not raidz.
|
devices and mirrored top-level vdevs (mirror of leaf devices); but not raidz.
|
||||||
.sp
|
.Pp
|
||||||
Removing a top-level vdev reduces the total amount of space in the storage pool.
|
Removing a top-level vdev reduces the total amount of space in the storage pool.
|
||||||
The specified device will be evacuated by copying all allocated space from it to
|
The specified device will be evacuated by copying all allocated space from it to
|
||||||
the other devices in the pool.
|
the other devices in the pool.
|
||||||
|
Loading…
Reference in New Issue
Block a user