make: generate

diff --git a/conf/example.conf.in b/conf/example.conf.in
index 6b16d35a9eafde51db8c5cd1281115bffc566083..cd3124f511356ba6ffaec940991907490742d3ea 100644 (file)
--- a/conf/example.conf.in
+++ b/conf/example.conf.in
@@ -1379,6 +1379,12 @@ global {
        # This configuration option has an automatic default value.
        # fsadm_executable = "@FSADM_PATH@"
 
+       # Configuration option global/lvresize_fs_helper_executable.
+       # The full path to the lvresize_fs_helper command.
+       # LVM uses this command to help with filesystem operations during lvresize.
+       # This configuration option has an automatic default value.
+       # lvresize_fs_helper_executable = "@LVRESIZE_FS_HELPER_PATH@"
+
        # Configuration option global/system_id_source.
        # The method LVM uses to set the local system ID.
        # Volume Groups can also be given a system ID (by vgcreate, vgchange,

diff --git a/conf/lvmlocal.conf.in b/conf/lvmlocal.conf.in
index 67e7d66a23c802d8bc2d808f381aaf91b389fb5b..9eab9673595cdd656d6385d448bff9508fee9143 100644 (file)
--- a/conf/lvmlocal.conf.in
+++ b/conf/lvmlocal.conf.in
@@ -38,6 +38,14 @@ local {
        # This configuration option has an automatic default value.
        # system_id = ""
 
+       # Configuration option local/pr_key.
+       # The local persistent reservation key in hexidecimal.
+       # The value must be unique among all hosts using the same VG.
+       # The max length is 16 hex characters (8 bytes), plus an optional
+       # 0x prefix. If pr_key is not set, host_id will be used to create a key.
+       # This configuration option has an automatic default value.
+       # pr_key = ""
+
        # Configuration option local/extra_system_ids.
        # A list of extra VG system IDs the local host can access.
        # VGs with the system IDs listed here (in addition to the host's own
@@ -52,7 +60,9 @@ local {
        # The sanlock host_id used by lvmlockd. This must be unique among all the hosts
        # using shared VGs with sanlock. Accepted values are 1-2000, except when sanlock_align_size
        # is configured to 1, 2 or 4, which correspond to max host_id values of 250, 500, or 1000.
-       # Applicable only if LVM is compiled with support for lvmlockd+sanlock.
+       # When using persistent reservations, lvm will generate a PR key from the host_id
+       # if pr_key is not defined. All hosts using a sanlock shared VG with PR must use
+       # the same approach for configuring their PR key (pr_key or host_id.)
        # This configuration option has an automatic default value.
        # host_id = 0
 }

diff --git a/man/lvchange.8_pregen b/man/lvchange.8_pregen
index f45d8001cb401cbd5ae31b5f6c25b9f881d15c23..1e87db1b85e55a76c9b0372e546e23d61ec18a18 100644 (file)
--- a/man/lvchange.8_pregen
+++ b/man/lvchange.8_pregen
@@ -891,7 +891,7 @@ See \fBvgcfgbackup\fP(8) for more information.
 Specifies when writes to a cache LV should be considered complete.
 \fBwriteback\fP considers a write complete as soon as it is
 stored in the cache pool.
-\fBwritethough\fP considers a write complete only when it has
+\fBwritethrough\fP considers a write complete only when it has
 been stored in both the cache pool and on the origin LV.
 While writethrough may be slower for writes, it is more
 resilient if something should happen to a device associated with the
@@ -923,7 +923,7 @@ See \fBlvm.conf\fP(5) for more information about profiles.
 .
 .TP
 .O_compression
-Controls whether compression is enabled or disable for VDO volume.
+Controls whether compression is enabled or disabled for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
 .
 .TP
@@ -948,7 +948,7 @@ messages sent to the log file and/or syslog (if configured).
 .
 .TP
 .O_deduplication
-Controls whether deduplication is enabled or disable for VDO volume.
+Controls whether deduplication is enabled or disabled for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
 .
 .TP

diff --git a/man/lvconvert.8_pregen b/man/lvconvert.8_pregen
index 7ff0d1d791106dfab61da5feedda6c30099ea9e7..d5173a65164f2a8edf798281a735daff0a661ee7 100644 (file)
--- a/man/lvconvert.8_pregen
+++ b/man/lvconvert.8_pregen
@@ -1750,7 +1750,7 @@ Specifies the cache metadata format used by cache target.
 Specifies when writes to a cache LV should be considered complete.
 \fBwriteback\fP considers a write complete as soon as it is
 stored in the cache pool.
-\fBwritethough\fP considers a write complete only when it has
+\fBwritethrough\fP considers a write complete only when it has
 been stored in both the cache pool and on the origin LV.
 While writethrough may be slower for writes, it is more
 resilient if something should happen to a device associated with the
@@ -1807,7 +1807,7 @@ See \fBlvm.conf\fP(5) for more information about profiles.
 .
 .TP
 .O_compression
-Controls whether compression is enabled or disable for VDO volume.
+Controls whether compression is enabled or disabled for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
 .
 .TP
@@ -1824,7 +1824,7 @@ messages sent to the log file and/or syslog (if configured).
 .
 .TP
 .O_deduplication
-Controls whether deduplication is enabled or disable for VDO volume.
+Controls whether deduplication is enabled or disabled for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
 .
 .TP
@@ -2009,7 +2009,7 @@ Use VDO type volume for pool data volume.
 .
 .TP
 .O_poolmetadata
-The name of a an LV to use for storing pool metadata.
+The name of an LV to use for storing pool metadata.
 .
 .TP
 .O_poolmetadatasize

diff --git a/man/lvcreate.8_pregen b/man/lvcreate.8_pregen
index 5a8c9cc2e839e61c73957c2117489e0ca98e336d..b3a51c4e6196a4cda4bfa4d2b598e1ecb8c9a5ba 100644 (file)
--- a/man/lvcreate.8_pregen
+++ b/man/lvcreate.8_pregen
@@ -1575,7 +1575,7 @@ Specifies the cache metadata format used by cache target.
 Specifies when writes to a cache LV should be considered complete.
 \fBwriteback\fP considers a write complete as soon as it is
 stored in the cache pool.
-\fBwritethough\fP considers a write complete only when it has
+\fBwritethrough\fP considers a write complete only when it has
 been stored in both the cache pool and on the origin LV.
 While writethrough may be slower for writes, it is more
 resilient if something should happen to a device associated with the
@@ -1632,7 +1632,7 @@ See \fBlvm.conf\fP(5) for more information about profiles.
 .
 .TP
 .O_compression
-Controls whether compression is enabled or disable for VDO volume.
+Controls whether compression is enabled or disabled for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
 .
 .TP
@@ -1657,7 +1657,7 @@ messages sent to the log file and/or syslog (if configured).
 .
 .TP
 .O_deduplication
-Controls whether deduplication is enabled or disable for VDO volume.
+Controls whether deduplication is enabled or disabled for VDO volume.
 See \fBlvmvdo\fP(7) for more information about VDO usage.
 .
 .TP
@@ -1847,7 +1847,7 @@ This is useful for skipping a potentially long and resource intensive initial
 sync of an empty mirror/raid1/raid4/raid5 and raid10 LV.
 This option is not valid for raid6, because raid6 relies on proper parity
 (P and Q Syndromes) being created during initial synchronization in order
-to reconstruct proper user date in case of device failures.
+to reconstruct proper user data in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
 .

diff --git a/man/lvextend.8_pregen b/man/lvextend.8_pregen
index e52d46fd47bfef1e7fdff626daed60f3c6223a33..2729d6eda06e70df5dcd270dfe3c9ee0d291359a 100644 (file)
--- a/man/lvextend.8_pregen
+++ b/man/lvextend.8_pregen
@@ -713,7 +713,7 @@ This is useful for skipping a potentially long and resource intensive initial
 sync of an empty mirror/raid1/raid4/raid5 and raid10 LV.
 This option is not valid for raid6, because raid6 relies on proper parity
 (P and Q Syndromes) being created during initial synchronization in order
-to reconstruct proper user date in case of device failures.
+to reconstruct proper user data in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
 .

diff --git a/man/lvresize.8_pregen b/man/lvresize.8_pregen
index a1f127a1eae7eb5939977c72d23a4942f07d3d51..8c1ff4dfd51db4c3e2e0c69b3e51ba9b7dbaa503 100644 (file)
--- a/man/lvresize.8_pregen
+++ b/man/lvresize.8_pregen
@@ -639,7 +639,7 @@ This is useful for skipping a potentially long and resource intensive initial
 sync of an empty mirror/raid1/raid4/raid5 and raid10 LV.
 This option is not valid for raid6, because raid6 relies on proper parity
 (P and Q Syndromes) being created during initial synchronization in order
-to reconstruct proper user date in case of device failures.
+to reconstruct proper user data in case of device failures.
 raid0 and raid0_meta do not provide any data copies or parity support
 and thus do not support initial synchronization.
 .

diff --git a/man/vgchange.8_pregen b/man/vgchange.8_pregen
index 6711f6a97d8cac54de6d369a3ed712f25f18a958..603ed2d21fe16922b5be7440920639f235289ea6 100644 (file)
--- a/man/vgchange.8_pregen
+++ b/man/vgchange.8_pregen
@@ -159,6 +159,10 @@
 .de O_partial
 .OPS P partial
 ..
+.de O_persist
+.OPA persist
+\fIString\fP
+..
 .de O_physicalextentsize
 .OPA s physicalextentsize
 \fISize\fP[m|\:UNIT]
@@ -185,6 +189,10 @@
 .de O_refresh
 .OPS refresh
 ..
+.de O_removekey
+.OPA removekey
+\fIString\fP
+..
 .de O_reportformat
 .OPA reportformat
 \%\fBbasic\fP|\:\
@@ -203,6 +211,10 @@
 .OPA setautoactivation
 \fBy\fP|\fBn\fP
 ..
+.de O_setpersist
+.OPA setpersist
+\fIString\fP
+..
 .de O_sysinit
 .OPS sysinit
 ..
@@ -318,6 +330,8 @@ vgchange \(em Change volume group attributes
 .br
 .O_partial
 .br
+.O_persist
+.br
 .O_physicalextentsize
 .br
 .O_poll
@@ -332,6 +346,8 @@ vgchange \(em Change volume group attributes
 .br
 .O_refresh
 .br
+.O_removekey
+.br
 .O_reportformat
 .br
 .O_resizeable
@@ -340,6 +356,8 @@ vgchange \(em Change volume group attributes
 .br
 .O_setautoactivation
 .br
+.O_setpersist
+.br
 .O_sysinit
 .br
 .O_systemid
@@ -591,6 +609,10 @@ Activate or deactivate LVs.
 ]
 .br
 [
+.O_persist
+]
+.br
+[
 .O_ignoremonitoring
 ]
 .br
@@ -675,6 +697,64 @@ Change the system ID of a VG.
 .O_majoritypvs
 ]
 .br
+[
+.O_persist
+]
+.br
+[
+.O_removekey
+]
+.br
+[ COMMON_OPTIONS ]
+.RE
+.
+.P
+\(em
+.P
+.
+Set or clear flags to control persistent reservation behavior.
+.P
+.B vgchange
+.O_setpersist
+\fIVG\fP|\fITag\fP|\fISelect\fP
+.RS
+[
+.O_select
+]
+.br
+[
+.O_persist
+]
+.br
+[ COMMON_OPTIONS ]
+.RE
+.
+.P
+\(em
+.P
+.
+Perform persistent reservation commands on devices.
+.P
+.B vgchange
+.O_persist
+\fIVG\fP|\fITag\fP|\fISelect\fP
+.RS
+[
+.O_select
+]
+.br
+[
+.O_force
+]
+.br
+[
+.O_removekey
+]
+.br
+[
+.O_majoritypvs
+]
+.br
 [ COMMON_OPTIONS ]
 .RE
 .
@@ -691,6 +771,10 @@ Start the lockspace of a shared VG in lvmlockd.
 .O_select
 ]
 .br
+[
+.O_persist
+]
+.br
 [ COMMON_OPTIONS ]
 .br
 [ \fIVG\fP|\fITag\fP|\fISelect\fP\ .\|.\|.\& ]
@@ -709,6 +793,10 @@ Stop the lockspace of a shared VG in lvmlockd.
 .O_select
 ]
 .br
+[
+.O_persist
+]
+.br
 [ COMMON_OPTIONS ]
 .br
 [ \fIVG\fP|\fITag\fP|\fISelect\fP\ .\|.\|.\& ]
@@ -1047,6 +1135,20 @@ according to the  missing_stripe_filler setting.
 Metadata may not be changed with this option.
 .
 .TP
+.O_persist
+Persistent Reservation operation.
+start: register local key and acquire reservation.
+stop: unregister local key, releasing reservation.
+remove: preempt and abort another key.
+clear: remove reservation and keys.
+check: check if started.
+autostart: start if the VG autostart flag is set.
+lvmlocal.conf pr_key or host_id must be configured to use PR.
+For local VGs, Write Exclusive (WE) is used, and for shared VGs
+Write Exclusive, all registrants (WEAR) is used.
+Use --setpersist to automate and/or require PR.
+.
+.TP
 .O_physicalextentsize
 Sets the physical extent size of PVs in the VG.
 The value must be either a power of 2 of at least 1 sector
@@ -1105,6 +1207,10 @@ Also, this operation may be useful if something has gone wrong,
 or if some form of manual LV sharing is being used.
 .
 .TP
+.O_removekey
+A persistent reservation key to remove.
+.
+.TP
 .O_reportformat
 Overrides current output format for reports which is defined globally by
 the report/output_format setting in \fBlvm.conf\fP(5).
@@ -1146,6 +1252,20 @@ If autoactivation is enabled on a VG, autoactivation can be disabled
 for individual LVs.
 .
 .TP
+.O_setpersist
+Set or clear flags to control persistent reservation behavior.
+autostart: set flag, PR will be automatically started.
+noautostart: clear autostart flag.
+require: set flag, PR will be required to write or activate VG.
+norequire: clear require flag.
+y: set autostart and require flags.
+n: clear autostart and require flags.
+When autostart is enabled, autoactivation and auto-lockstart
+commands will first start PR.
+lvmlocal.conf pr_key or host_id must be configured to use PR.
+For local VGs, enabling system_id is also recommended.
+.
+.TP
 .O_sysinit
 Indicates that vgchange/lvchange is being invoked
 from early system initialisation

diff --git a/man/vgexport.8_pregen b/man/vgexport.8_pregen
index 4cd61e128fb343740bf8b620eb717d7255e6a866..98da1669549888ac5581e8c99e479ec2757911de 100644 (file)
--- a/man/vgexport.8_pregen
+++ b/man/vgexport.8_pregen
@@ -74,6 +74,10 @@
 .de O_nolocking
 .OPS nolocking
 ..
+.de O_persist
+.OPA persist
+\fIString\fP
+..
 .de O_profile
 .OPA profile
 \fIString\fP
@@ -157,6 +161,10 @@ Export specified VGs.
 .O_select
 ]
 .br
+[
+.O_persist
+]
+.br
 [ COMMON_OPTIONS ]
 .RE
 .
@@ -334,6 +342,20 @@ Disable locking. Use with caution, concurrent commands may produce
 incorrect results.
 .
 .TP
+.O_persist
+Persistent Reservation operation.
+start: register local key and acquire reservation.
+stop: unregister local key, releasing reservation.
+remove: preempt and abort another key.
+clear: remove reservation and keys.
+check: check if started.
+autostart: start if the VG autostart flag is set.
+lvmlocal.conf pr_key or host_id must be configured to use PR.
+For local VGs, Write Exclusive (WE) is used, and for shared VGs
+Write Exclusive, all registrants (WEAR) is used.
+Use --setpersist to automate and/or require PR.
+.
+.TP
 .O_profile
 An alias for --commandprofile or --metadataprofile, depending
 on the command.

diff --git a/man/vgimport.8_pregen b/man/vgimport.8_pregen
index c070142f245578c6851f7f9f064681b66115c82b..854ed77488bb47c7751d7b990ba3a11e25a391e9 100644 (file)
--- a/man/vgimport.8_pregen
+++ b/man/vgimport.8_pregen
@@ -78,6 +78,10 @@
 .de O_nolocking
 .OPS nolocking
 ..
+.de O_persist
+.OPA persist
+\fIString\fP
+..
 .de O_profile
 .OPA profile
 \fIString\fP
@@ -147,6 +151,10 @@ Import specified VGs.
 .O_select
 ]
 .br
+[
+.O_persist
+]
+.br
 [ COMMON_OPTIONS ]
 .RE
 .
@@ -334,6 +342,20 @@ Disable locking. Use with caution, concurrent commands may produce
 incorrect results.
 .
 .TP
+.O_persist
+Persistent Reservation operation.
+start: register local key and acquire reservation.
+stop: unregister local key, releasing reservation.
+remove: preempt and abort another key.
+clear: remove reservation and keys.
+check: check if started.
+autostart: start if the VG autostart flag is set.
+lvmlocal.conf pr_key or host_id must be configured to use PR.
+For local VGs, Write Exclusive (WE) is used, and for shared VGs
+Write Exclusive, all registrants (WEAR) is used.
+Use --setpersist to automate and/or require PR.
+.
+.TP
 .O_profile
 An alias for --commandprofile or --metadataprofile, depending
 on the command.