lvm2-commits August 2015

lvm2-commits@lists.fedorahosted.org

7 participants
580 discussions

dev-prajnoha-pv-ext-flag-used - man lvmlockd: update
by Peter Rajnoha 21 Aug '15

21 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2bbf2fa8ebc3d723… Commit: 2bbf2fa8ebc3d723bc686689378db2a1fe8eaf6e Parent: 1c013e7ae29a9e3aa20930a24f3fcf0637ef1e91 Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Aug 7 15:18:44 2015 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Aug 7 15:18:44 2015 -0500 man lvmlockd: update --- man/lvmlockd.8.in | 549 ++++++++++++++++++++++++++--------------------------- 1 files changed, 269 insertions(+), 280 deletions(-) diff --git a/man/lvmlockd.8.in b/man/lvmlockd.8.in index 9318350..1daea18 100644 --- a/man/lvmlockd.8.in +++ b/man/lvmlockd.8.in @@ -8,75 +8,75 @@ LVM commands use lvmlockd to coordinate access to shared storage. .br When LVM is used on devices shared by multiple hosts, locks will: -.IP \[bu] 2 +\[bu] coordinate reading and writing of LVM metadata -.IP \[bu] 2 +.br +\[bu] validate caching of LVM metadata -.IP \[bu] 2 +.br +\[bu] prevent concurrent activation of logical volumes - -.P +.br lvmlockd uses an external lock manager to perform basic locking. .br Lock manager (lock type) options are: -.IP \[bu] 2 +\[bu] sanlock: places locks on disk within LVM storage. -.IP \[bu] 2 +.br +\[bu] dlm: uses network communication and a cluster manager. - -.P +.br .SH OPTIONS lvmlockd [options] -For default settings, see lvmlockd -h. +For default settings, see lvmlockd \-h. -.B --help | -h +.B \-\-help | \-h Show this help information. -.B --version | -V +.B \-\-version | \-V Show version of lvmlockd. -.B --test | -T +.B \-\-test | \-T Test mode, do not call lock manager. -.B --foreground | -f +.B \-\-foreground | \-f Don't fork. -.B --daemon-debug | -D +.B \-\-daemon\-debug | \-D Don't fork and print debugging to stdout. -.B --pid-file | -p +.B \-\-pid\-file | \-p .I path Set path to the pid file. -.B --socket-path | -s +.B \-\-socket\-path | \-s .I path Set path to the socket to listen on. -.B --syslog-priority | -S err|warning|debug +.B \-\-syslog\-priority | \-S err|warning|debug Write log messages from this level up to syslog. -.B --gl-type | -g -.I str - Set global lock type to be sanlock|dlm. +.B \-\-gl\-type | \-g sanlock|dlm + Set global lock type to be sanlock or dlm. -.B --host-id | -i +.B \-\-host\-id | \-i .I num Set the local sanlock host id. -.B --host-id-file | -F +.B \-\-host\-id\-file | \-F .I path A file containing the local sanlock host_id. -.B --sanlock-timeout | -o +.B \-\-sanlock\-timeout | \-o .I seconds Override the default sanlock I/O timeout. -.B --adopt | A 0|1 +.B \-\-adopt | \-A 0|1 Adopt locks from a previous instance of lvmlockd. @@ -84,7 +84,7 @@ For default settings, see lvmlockd -h. .SS Initial set up -Using LVM with lvmlockd for the first time includes some one-time set up +Using LVM with lvmlockd for the first time includes some one\-time set up steps: .SS 1. choose a lock manager @@ -112,9 +112,9 @@ use_lvmetad = 1 .I sanlock .br -Assign each host a unique host_id in the range 1-2000 by setting +Assign each host a unique host_id in the range 1\-2000 by setting .br -/etc/lvm/lvmlocal.conf local/host_id = <num> +/etc/lvm/lvmlocal.conf local/host_id .SS 3. start lvmlockd @@ -132,32 +132,32 @@ Follow external clustering documentation when applicable, otherwise: .br systemctl start corosync dlm -.SS 5. create VGs on shared devices +.SS 5. create VG on shared devices -vgcreate --shared <vg_name> <devices> +vgcreate \-\-shared <vgname> <devices> -The vgcreate --shared option sets the VG lock type to sanlock or dlm -depending on which lock manager is running. LVM commands will perform -locking for the VG using lvmlockd. +The shared option sets the VG lock type to sanlock or dlm depending on +which lock manager is running. LVM commands will perform locking for the +VG using lvmlockd. -.SS 6. start VGs on all hosts +.SS 6. start VG on all hosts -vgchange --lock-start +vgchange \-\-lock\-start -lvmlockd requires shared VGs to be "started" before they are used. This -is a lock manager operation to start/join the VG lockspace, and it may -take some time. Until the start completes, locks for the VG are not -available. LVM commands are allowed to read the VG while start is in -progress. (A service/init file can be used to start VGs.) +lvmlockd requires shared VGs to be started before they are used. This is +a lock manager operation to start (join) the VG lockspace, and it may take +some time. Until the start completes, locks for the VG are not available. +LVM commands are allowed to read the VG while start is in progress. (An +init/unit file can also be used to start VGs.) .SS 7. create and activate LVs Standard lvcreate and lvchange commands are used to create and activate -LVs in a lockd VG. +LVs in a shared VG. An LV activated exclusively on one host cannot be activated on another. When multiple hosts need to use the same LV concurrently, the LV can be -activated with a shared lock (see lvchange options -aey vs -asy.) +activated with a shared lock (see lvchange options \-aey vs \-asy.) (Shared locks are disallowed for certain LV types that cannot be used from multiple hosts.) @@ -165,43 +165,51 @@ multiple hosts.) .SS Normal start up and shut down After initial set up, start up and shut down include the following general -steps. They can be performed manually or using the system init/service +steps. They can be performed manually or using the system service manager. -.IP \[bu] 2 +\[bu] start lvmetad -.IP \[bu] 2 +.br +\[bu] start lvmlockd -.IP \[bu] 2 +.br +\[bu] start lock manager -.IP \[bu] 2 -vgchange --lock-start -.IP \[bu] 2 +.br +\[bu] +vgchange \-\-lock\-start +.br +\[bu] activate LVs in shared VGs - -.P +.br The shut down sequence is the reverse: -.IP \[bu] 2 +\[bu] deactivate LVs in shared VGs -.IP \[bu] 2 -vgchange --lock-stop -.IP \[bu] 2 +.br +\[bu] +vgchange \-\-lock\-stop +.br +\[bu] stop lock manager -.IP \[bu] 2 +.br +\[bu] stop lvmlockd -.IP \[bu] 2 +.br +\[bu] stop lvmetad +.br .P .SH TOPICS -.SS locking terms +.SS VG access control -The following terms are used to distinguish VGs that require locking from -those that do not. +The following terms are used to describe different forms of VG access +control. .I "lockd VG" @@ -210,18 +218,19 @@ Using it requires lvmlockd. These VGs exist on shared storage that is visible to multiple hosts. LVM commands use lvmlockd to perform locking for these VGs when they are used. -If the lock manager for a lock type is not available (e.g. not started or -failed), lvmlockd is not able to acquire locks from it, and LVM commands -are unable to fully use VGs with the given lock type. Commands generally -allow reading VGs in this condition, but changes and activation are not -allowed. Maintaining a properly running lock manager can require -background not covered here. +If the lock manager for the lock type is not available (e.g. not started +or failed), lvmlockd is unable to acquire locks for LVM commands. LVM +commands that only read the VG will generally be allowed to continue +without locks in this case (with a warning). Commands to modify or +activate the VG will fail without the necessary locks. Maintaining a +properly running lock manager requires knowledge covered in separate +documentation. .I "local VG" A "local VG" is meant to be used by a single host. It has no lock type or lock type "none". LVM commands and lvmlockd do not perform locking for -these VGs. A local VG typically exists on local (non-shared) devices and +these VGs. A local VG typically exists on local (non\-shared) devices and cannot be used concurrently from different hosts. If a local VG does exist on shared devices, it should be owned by a single @@ -240,21 +249,25 @@ clvmd for clustering. See below for converting a clvm VG to a lockd VG. .SS lockd VGs from hosts not using lvmlockd -Only hosts that will use lockd VGs should be configured to run lvmlockd. +Only hosts that use lockd VGs should be configured to run lvmlockd. However, devices with lockd VGs may be visible from hosts not using lvmlockd. From a host not using lvmlockd, visible lockd VGs are ignored in the same way as foreign VGs, i.e. those with a foreign system ID, see .BR lvmsystemid (7). -The --shared option displays lockd VGs on a host not using lvmlockd, like -the --foreign option does for foreign VGs. +The \-\-shared option for reporting and display commands causes lockd VGs +to be displayed on a host not using lvmlockd, like the \-\-foreign option +does for foreign VGs. -.SS vgcreate differences +.SS vgcreate comparison -Forms of the vgcreate command: +The type of VG access control is specified in the vgcreate command. +See +.BR vgcreate (8) +for all vgcreate options. -.B vgcreate <vg_name> <devices> +.B vgcreate <vgname> <devices> .IP \[bu] 2 Creates a local VG with the local system ID when neither lvmlockd nor clvm are configured. @@ -265,11 +278,12 @@ Creates a clvm VG when clvm is configured. .P -.B vgcreate --shared <vg_name> <devices> +.B vgcreate \-\-shared <vgname> <devices> .IP \[bu] 2 -Requires lvmlockd to be configured (use_lvmlockd=1). +Requires lvmlockd to be configured and running. .IP \[bu] 2 -Creates a lockd VG with lock type sanlock|dlm depending on which is running. +Creates a lockd VG with lock type sanlock|dlm depending on which lock +manager is running. .IP \[bu] 2 LVM commands request locks from lvmlockd to use the VG. .IP \[bu] 2 @@ -277,9 +291,9 @@ lvmlockd obtains locks from the selected lock manager. .P -.B vgcreate -c|--clustered y <vg_name> <devices> +.B vgcreate \-c|\-\-clustered y <vgname> <devices> .IP \[bu] 2 -Requires clvm to be configured (locking_type=3). +Requires clvm to be configured and running. .IP \[bu] 2 Creates a clvm VG with the "clustered" flag. .IP \[bu] 2 @@ -289,62 +303,79 @@ LVM commands request locks from clvmd to use the VG. .SS using lockd VGs +There are some special considerations to be aware of when using lockd VGs. + When use_lvmlockd is first enabled, and before the first lockd VG is -created, no global lock will exist, and LVM commands will try and fail to -acquire it. LVM commands will report a warning until the first lockd VG -is created which will create the global lock. Before the global lock -exists, VGs can still be read, but commands that require the global lock -exclusively will fail. +created, no global lock will exist. In this initial state, LVM commands +try and fail to acquire the global lock, producing a warning, and some +commands are disallowed. Once the first lockd VG is created, the global +lock will be available, and LVM will be fully operational. When a new lockd VG is created, its lockspace is automatically started on -the host that creates the VG. Other hosts will need to run 'vgchange ---lock-start' to start the new VG before they can use it. +the host that creates it. Other hosts need to run 'vgchange +\-\-lock\-start' to start the new VG before they can use it. From the 'vgs' command, lockd VGs are indicated by "s" (for shared) in the sixth attr field. The specific lock type and lock args for a lockd VG can -be displayed with 'vgs -o+locktype,lockargs'. +be displayed with 'vgs \-o+locktype,lockargs'. + +lockd VGs need to be "started" and "stopped", unlike other types of VGs. +See the following section for a full description of starting and stopping. .SS starting and stopping VGs -Starting a lockd VG (vgchange --lock-start) causes the lock manager to -start or join the lockspace for the VG. This makes locks for the VG -accessible to the host. Stopping the VG leaves the lockspace and makes -locks for the VG inaccessible to the host. +Starting a lockd VG (vgchange \-\-lock\-start) causes the lock manager to +start (join) the lockspace for the VG on the host where it is run. This +makes locks for the VG available to LVM commands on the host. Before a VG +is started, only LVM commands that read/display the VG without locks are +allowed. -Lockspaces should be started as early as possible because starting -(joining) a lockspace can take a long time (potentially minutes after a -host failure when using sanlock.) A VG can be started after all the -following are true: +Stopping a lockd VG (vgchange \-\-lock\-stop) causes the lock manager to +stop (leave) the lockspace for the VG on the host where it is run. This +makes locks for the VG inaccessible to the host. A VG cannot be stopped +while it has active LVs. -.nf -- lvmlockd is running -- lock manager is running -- VG is visible to the system -.fi +When using the lock type sanlock, starting a VG can take a long time +(potentially minutes if the host was previously shut down without cleanly +stopping the VG.) + +A lockd VG can be started after all the following are true: +.br +\[bu] +lvmlockd is running +.br +\[bu] +the lock manager is running +.br +\[bu] +the VG is visible to the system +.br + +A lockd VG can be stopped if all LVs are deactivated. All lockd VGs can be started/stopped using: .br -vgchange --lock-start +vgchange \-\-lock-start .br -vgchange --lock-stop +vgchange \-\-lock-stop Individual VGs can be started/stopped using: .br -vgchange --lock-start <vg_name> ... +vgchange \-\-lock\-start <vgname> ... .br -vgchange --lock-stop <vg_name> ... +vgchange \-\-lock\-stop <vgname> ... To make vgchange not wait for start to complete: .br -vgchange --lock-start --lock-opt nowait +vgchange \-\-lock\-start \-\-lock\-opt nowait .br -vgchange --lock-start --lock-opt nowait <vg_name> +vgchange \-\-lock\-start \-\-lock\-opt nowait <vgname> To stop all lockspaces and wait for all to complete: .br -lvmlockctl --stop-lockspaces --wait +lvmlockctl \-\-stop\-lockspaces \-\-wait To start only selected lockd VGs, use the lvm.conf activation/lock_start_list. When defined, only VG names in this list are @@ -366,7 +397,7 @@ Scripts or programs on a host that automatically start VGs will use the "auto" option to indicate that the command is being run automatically by the system: -vgchange --lock-start --lock-opt auto [vg_name ...] +vgchange \-\-lock\-start \-\-lock\-opt auto [<vgname> ...] Without any additional configuration, including the "auto" option has no effect; all VGs are started unless restricted by lock_start_list. @@ -387,21 +418,25 @@ To use auto activation of lockd LVs (see auto_activation_volume_list), auto starting of the corresponding lockd VGs is necessary. -.SS locking activity +.SS internal command locking -To optimize the use of LVM with lvmlockd, consider the three kinds of -locks in lvmlockd and when they are used: +To optimize the use of LVM with lvmlockd, be aware of the three kinds of +locks and when they are used: .I GL lock The global lock (GL lock) is associated with global information, which is information not isolated to a single VG. This includes: -- The global VG namespace. +\[bu] +The global VG namespace. +.br +\[bu] +The set of orphan PVs and unused devices. .br -- The set of orphan PVs and unused devices. +\[bu] +The properties of orphan PVs, e.g. PV size. .br -- The properties of orphan PVs, e.g. PV size. The global lock is used in shared mode by commands that read this information, or in exclusive mode by commands that change it. @@ -414,12 +449,7 @@ creates a new VG name, and it takes a PV from the list of unused PVs. When an LVM command is given a tag argument, or uses select, it must read all VGs to match the tag or selection, which causes the global lock to be -acquired. To avoid use of the global lock, avoid using tags and select, -and specify VG name arguments. - -When use_lvmlockd is enabled, LVM commands attempt to acquire the global -lock even if no lockd VGs exist. For this reason, lvmlockd should not be -enabled unless lockd VGs will be used. +acquired. .I VG lock @@ -432,7 +462,7 @@ The command 'vgs' will not only acquire the GL lock to read the list of all VG names, but will acquire the VG lock for each VG prior to reading it. -The command 'vgs <vg_name>' does not acquire the GL lock (it does not need +The command 'vgs <vgname>' does not acquire the GL lock (it does not need the list of all VG names), but will acquire the VG lock on each VG name argument. @@ -444,14 +474,14 @@ activated. LV locks are persistent and remain in place after the activation command is done. GL and VG locks are transient, and are held only while an LVM command is running. -.I retries +.I lock retries If a request for a GL or VG lock fails due to a lock conflict with another host, lvmlockd automatically retries for a short time before returning a -failure to the LVM command. The LVM command will then retry the entire -lock request a number of times specified by global/lvmlockd_lock_retries -before failing. If a request for an LV lock fails due to a lock conflict, -the command fails immediately. +failure to the LVM command. If those retries are insufficient, the LVM +command will retry the entire lock request a number of times specified by +global/lvmlockd_lock_retries before failing. If a request for an LV lock +fails due to a lock conflict, the command fails immediately. .SS sanlock global lock @@ -470,21 +500,22 @@ are moved or removed. The vgcreate command typically acquires the global lock, but in the case of the first sanlock VG, there will be no global lock to acquire until the -initial vgcreate is complete. So, creating the first sanlock VG is a +first vgcreate is complete. So, creating the first sanlock VG is a special case that skips the global lock. vgcreate for a sanlock VG determines it is the first one to exist if no other sanlock VGs are visible. It is possible that other sanlock VGs do -exist but are not visible or started on the host running vgcreate. This -raises the possibility of more than one global lock existing. If this -happens, commands will warn of the condition, and it should be manually -corrected. +exist but are not visible on the host running vgcreate. In this case, +vgcreate would create a new sanlock VG with the global lock enabled. When +the other VG containing a global lock appears, lvmlockd will see more than +one VG with a global lock enabled, and LVM commands will report that there +are duplicate global locks. If the situation arises where more than one sanlock VG contains a global lock, the global lock should be manually disabled in all but one of them with the command: -lvmlockctl --gl-disable <vg_name> +lvmlockctl \-\-gl\-disable <vgname> (The one VG with the global lock enabled must be visible to all hosts.) @@ -494,55 +525,18 @@ and subsequent LVM commands will fail to acquire it. In this case, the global lock needs to be manually enabled in one of the remaining sanlock VGs with the command: -lvmlockctl --gl-enable <vg_name> +lvmlockctl \-\-gl\-enable <vgname> A small sanlock VG dedicated to holding the global lock can avoid the case where the GL lock must be manually enabled after a vgremove. -.SS changing a local VG to a lockd VG - -All LVs must be inactive to change the lock type. - -lvmlockd must be configured and running as described in USAGE. - -Change a local VG to a lockd VG with the command: -.br -vgchange \-\-lock\-type sanlock|dlm <vg_name> - -Start the VG on any hosts that need to use it: -.br -vgchange \-\-lock\-start <vg_name> +.SS sanlock VG usage - -.SS changing a clvm VG to a lockd VG - -All LVs must be inactive to change the lock type. - -1. Change the clvm VG to a local VG. - -Within a running clvm cluster, change a clvm VG to a local VG with the -command: - -vgchange \-cn <vg_name> - -If the clvm cluster is no longer running on any nodes, then extra options -can be used forcibly make the VG local. Caution: this is only safe if all -nodes have stopped using the VG: - -vgchange \-\-config 'global/locking_type=0 global/use_lvmlockd=0' -.RS -\-cn <vg_name> -.RE - -2. After the VG is local, follow the steps described in "changing a local -VG to a lockd VG". - - -.SS vgremove and vgreduce with sanlock VGs +There are some special cases related to using a sanlock VG. vgremove of a sanlock VG will fail if other hosts have the VG started. -Run vgchange --lock-stop <vg_name> on all other hosts before vgremove. +Run vgchange \-\-lock-stop <vgname> on all other hosts before vgremove. (It may take several seconds before vgremove recognizes that all hosts have stopped.) @@ -550,17 +544,20 @@ have stopped.) A sanlock VG contains a hidden LV called "lvmlock" that holds the sanlock locks. vgreduce cannot yet remove the PV holding the lvmlockd LV. +To place the lvmlock LV on a specific device, create the VG with only that +device, then use vgextend to add other devices. + .SS shared LVs When an LV is used concurrently from multiple hosts (e.g. by a -multi-host/cluster application or file system), the LV can be activated on -multiple hosts concurrently using a shared lock. +multi\-host/cluster application or file system), the LV can be activated +on multiple hosts concurrently using a shared lock. -To activate the LV with a shared lock: lvchange -asy vg/lv. +To activate the LV with a shared lock: lvchange \-asy vg/lv. With lvmlockd, an unspecified activation mode is always exclusive, i.e. --ay defaults to -aey. +\-ay defaults to \-aey. If the LV type does not allow the LV to be used concurrently from multiple hosts, then a shared activation lock is not allowed and the lvchange @@ -578,57 +575,13 @@ locks if the PV holding the locks is lost. Contact the LVM group for help with this process. -.\" This is not clean or safe enough to suggest using without help. -.\" -.\" .SS recover from lost PV holding sanlock locks -.\" -.\" In a sanlock VG, the locks are stored on a PV within the VG. If this PV -.\" is lost, the locks need to be reconstructed as follows: -.\" -.\" 1. Enable the unsafe lock modes option in lvm.conf so that default locking requirements can be overriden. -.\" -.\" .nf -.\" allow_override_lock_modes = 1 -.\" .fi -.\" -.\" 2. Remove missing PVs and partial LVs from the VG. -.\" -.\" Warning: this is a dangerous operation. Read the man page -.\" for vgreduce first, and try running with the test option. -.\" Verify that the only missing PV is the PV holding the sanlock locks. -.\" -.\" .nf -.\" vgreduce --removemissing --force --lock-gl na --lock-vg na <vg> -.\" .fi -.\" -.\" 3. If step 2 does not remove the internal/hidden "lvmlock" lv, it should be removed. -.\" -.\" .nf -.\" lvremove --lock-vg na --lock-lv na <vg>/lvmlock -.\" .fi -.\" -.\" 4. Change the lock type to none. -.\" -.\" .nf -.\" vgchange --lock-type none --force --lock-gl na --lock-vg na <vg> -.\" .fi -.\" -.\" 5. VG space is needed to recreate the locks. If there is not enough space, vgextend the vg. -.\" -.\" 6. Change the lock type back to sanlock. This creates a new internal -.\" lvmlock lv, and recreates locks. -.\" -.\" .nf -.\" vgchange --lock-type sanlock <vg> -.\" .fi - .SS locking system failures .B lvmlockd failure If lvmlockd fails or is killed while holding locks, the locks are orphaned -in the lock manager. lvmlockd can be restarted, and it will adopt the -locks from the lock manager that had been held by the previous instance. +in the lock manager. lvmlockd can be restarted with an option to adopt +locks in the lock manager that had been held by the previous instance. .B dlm/corosync failure @@ -638,37 +591,33 @@ method configured within the dlm/corosync clustering environment. LVM commands on other hosts will be blocked from acquiring any locks until the dlm/corosync recovery process is complete. -.B sanlock lock storage failure - -If access to the device containing the VG's locks is lost, sanlock cannot -renew its leases for locked LVs. This means that the host could soon lose -the lease to another host which could activate the LV exclusively. -sanlock is designed to never reach the point where two hosts hold the -same lease exclusively at once, so the same LV should never be active on -two hosts at once when activated exclusively. - -The current method of handling this involves no action from lvmlockd, -which allows sanlock to protect the leases itself. This produces a safe -but potentially inconvenient result. Doing nothing from lvmlockd leads to -the host's LV locks not being released, which leads to sanlock using the -local watchdog to reset the host before another host can acquire any locks -held by the local host. - -LVM commands on other hosts will be blocked from acquiring locks held by -the failed/reset host until the sanlock recovery time expires (2-4 -minutes). This includes activation of any LVs that were locked by the -failed host. It also includes GL/VG locks held by any LVM commands that -happened to be running on the failed host at the time of the failure. - -(In the future, lvmlockd may have the option to suspend locked LVs in -response the sanlock leases expiring. This would avoid the need for -sanlock to reset the host.) +.B sanlock lease storage failure + +If a host loses access to the device holding a VG's locks, sanlock cannot +renew the VG's lockspace lease for those locks. After some time, the +lease will expire, and locks held by the host can be acquired by other +hosts. + +If no LVs are active in the VG, the lockspace with an expiring lease will +be shut down, and errors will be reported when trying to use the VG. Use +the lvmlockctl \-\-drop command to clear the stale lockspace from +lvmlockd. + +If the VG has active LVs, the LVs must be quickly deactivated before the +lockspace lease expires. After all LVs are deactivated, run lvmlockctl +\-\-drop <vgname> to clear the expiring lockspace from lvmlockd. If all +LVs in the VG are not deactivated within about 40 seconds, sanlock will +reset the host using the local watchdog. The host reset is ultimately a +severe form of "deactivating" LVs before they can be activated on other +hosts. The reset is considered a better alternative than having LVs used +by multiple hosts at once, which could easily damage or destroy their +content. A future enhancement may automatically attempt to deactivate LVs +before the lockspace lease expires. .B sanlock daemon failure If the sanlock daemon fails or exits while a lockspace is started, the -local watchdog will reset the host. See previous section for the impact -on other hosts. +local watchdog will reset the host. .SS changing dlm cluster name @@ -688,44 +637,84 @@ cluster name for the dlm VG must be changed. To do this: 3. Change the VG lock type to none: .br - vgchange --lock-type none --force <vg_name> + vgchange \-\-lock\-type none \-\-force <vgname> 4. Change the VG lock type back to dlm which sets the new cluster name: .br - vgchange --lock-type dlm <vg_name> + vgchange \-\-lock\-type dlm <vgname> -.SS limitations of lvmlockd and lockd VGs +.SS changing a local VG to a lockd VG -lvmlockd currently requires using lvmetad and lvmpolld. +All LVs must be inactive to change the lock type. + +lvmlockd must be configured and running as described in USAGE. -If a lockd VG becomes visible after the initial system startup, it is not -automatically started through the system service/init manager, and LVs in -it are not autoactivated. +Change a local VG to a lockd VG with the command: +.br +vgchange \-\-lock\-type sanlock|dlm <vgname> + +Start the VG on any hosts that need to use it: +.br +vgchange \-\-lock\-start <vgname> + + +.SS changing a clvm VG to a lockd VG + +All LVs must be inactive to change the lock type. + +First change the clvm VG to a local VG. Within a running clvm cluster, +change a clvm VG to a local VG with the command: + +vgchange \-cn <vgname> + +If the clvm cluster is no longer running on any nodes, then extra options +can be used forcibly make the VG local. Caution: this is only safe if all +nodes have stopped using the VG: + +vgchange \-\-config 'global/locking_type=0 global/use_lvmlockd=0' +.RS +\-cn <vgname> +.RE + +After the VG is local, follow the steps described in "changing a local VG +to a lockd VG". + + +.SS limitations of lockd VGs + +lvmlockd currently requires using lvmetad and lvmpolld. Things that do not yet work in lockd VGs: .br -- creating a new thin pool and a new thin LV in a single command +\[bu] +creating a new thin pool and a new thin LV in a single command .br -- using lvcreate to create cache pools or cache LVs (use lvconvert) +\[bu] +using lvcreate to create cache pools or cache LVs (use lvconvert) .br -- using external origins for thin LVs +\[bu] +using external origins for thin LVs .br -- splitting mirrors and snapshots from LVs +\[bu] +splitting mirrors and snapshots from LVs .br -- vgsplit +\[bu] +vgsplit .br -- vgmerge +\[bu] +vgmerge .br -- resizing an LV that is active in the shared mode on multiple hosts +\[bu] +resizing an LV that is active in the shared mode on multiple hosts -.SS clvmd to lvmlockd transition +.SS lvmlockd changes from clvmd (See above for converting an existing clvm VG to a lockd VG.) -While lvmlockd and clvmd are entirely different systems, LVM usage remains -largely the same. Differences are more notable when using lvmlockd's +While lvmlockd and clvmd are entirely different systems, LVM command usage +remains similar. Differences are more notable when using lvmlockd's sanlock option. Visible usage differences between lockd VGs with lvmlockd and clvm VGs @@ -736,19 +725,16 @@ lvm.conf must be configured to use either lvmlockd (use_lvmlockd=1) or clvmd (locking_type=3), but not both. .IP \[bu] 2 -vgcreate --shared creates a lockd VG, and vgcreate --clustered y creates a -clvm VG. +vgcreate \-\-shared creates a lockd VG, and vgcreate \-\-clustered y +creates a clvm VG. .IP \[bu] 2 lvmlockd adds the option of using sanlock for locking, avoiding the need for network clustering. .IP \[bu] 2 -lvmlockd does not require all hosts to see all the same shared devices. - -.IP \[bu] 2 lvmlockd defaults to the exclusive activation mode whenever the activation -mode is unspecified, i.e. -ay means -aey, not -asy. +mode is unspecified, i.e. \-ay means \-aey, not \-asy. .IP \[bu] 2 lvmlockd commands always apply to the local host, and never have an effect @@ -762,13 +748,13 @@ lvmlockd saves the cluster name for a lockd VG using dlm. Only hosts in the matching cluster can use the VG. .IP \[bu] 2 -lvmlockd requires starting/stopping lockd VGs with vgchange --lock-start -and --lock-stop. +lvmlockd requires starting/stopping lockd VGs with vgchange \-\-lock-start +and \-\-lock-stop. .IP \[bu] 2 vgremove of a sanlock VG may fail indicating that all hosts have not -stopped the lockspace for the VG. Stop the VG lockspace on all uses using -vgchange --lock-stop. +stopped the VG lockspace. Stop the VG on all hosts using vgchange +\-\-lock-stop. .IP \[bu] 2 vgreduce of a PV in a sanlock VG may fail if it holds the internal @@ -777,12 +763,15 @@ vgreduce of a PV in a sanlock VG may fail if it holds the internal .IP \[bu] 2 lvmlockd uses lock retries instead of lock queueing, so high lock contention may require increasing global/lvmlockd_lock_retries to -avoid transient lock contention failures. +avoid transient lock failures. + +.IP \[bu] 2 +lvmlockd includes VG reporting options lock_type and lock_args, and LV +reporting option lock_args to view the corresponding metadata fields. .IP \[bu] 2 -The reporting options locktype and lockargs can be used to view lockd VG -and LV lock_type and lock_args fields, i.g. vgs -o+locktype,lockargs. -In the sixth VG attr field, "s" for "shared" is displayed for lockd VGs. +In the 'vgs' command's sixth VG attr field, "s" for "shared" is displayed +for lockd VGs. .IP \[bu] 2 If lvmlockd fails or is killed while in use, locks it held remain but are

1 0

dev-prajnoha-pv-ext-flag-used - libdm: Whitespace.
by Peter Rajnoha 21 Aug '15

21 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=2f334afb9836a792… Commit: 2f334afb9836a792fd4e277d02ad6f317faa78ab Parent: 88551add9725ab9a6866bce2cd1e4428078d76d1 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Wed Aug 5 05:21:58 2015 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Wed Aug 5 05:21:58 2015 +0100 libdm: Whitespace. --- libdm/libdevmapper.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h index 11ba0a3..4a1703e 100644 --- a/libdm/libdevmapper.h +++ b/libdm/libdevmapper.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved. * Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved. - * Copyright (C) 2006 Rackable Systems All rights reserved. + * Copyright (C) 2006 Rackable Systems All rights reserved. * * This file is part of the device-mapper userspace tools. * @@ -528,12 +528,12 @@ struct dm_tree_node; /* * Initialise an empty dependency tree. * - * The tree consists of a root node together with one node for each mapped + * The tree consists of a root node together with one node for each mapped * device which has child nodes for each device referenced in its table. * * Every node in the tree has one or more children and one or more parents. * - * The root node is the parent/child of every node that doesn't have other + * The root node is the parent/child of every node that doesn't have other * parents/children. */ struct dm_tree *dm_tree_create(void); @@ -641,7 +641,7 @@ int dm_tree_suspend_children(struct dm_tree_node *dnode, * Skip the filesystem sync when suspending. * Does nothing with other functions. * Use this when no snapshots are involved. - */ + */ void dm_tree_skip_lockfs(struct dm_tree_node *dnode); /* @@ -712,7 +712,7 @@ int dm_tree_node_add_crypt_target(struct dm_tree_node *node, const char *key); int dm_tree_node_add_mirror_target(struct dm_tree_node *node, uint64_t size); - + /* Mirror log flags */ #define DM_NOSYNC 0x00000001 /* Known already in sync */ #define DM_FORCESYNC 0x00000002 /* Force resync */ @@ -1285,7 +1285,7 @@ struct dm_list *dm_list_prev(const struct dm_list *head, const struct dm_list *e struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *elem); /* - * Given the address v of an instance of 'struct dm_list' called 'head' + * Given the address v of an instance of 'struct dm_list' called 'head' * contained in a structure of type t, return the containing structure. */ #define dm_list_struct_base(v, t, head) \ @@ -1317,7 +1317,7 @@ struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *e for (v = (head)->n; v != head; v = v->n) /* - * Set v to each element in a list in turn, starting from the element + * Set v to each element in a list in turn, starting from the element * in front of 'start'. * You can use this to 'unwind' a list_iterate and back out actions on * already-processed elements. @@ -1372,7 +1372,7 @@ struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *e dm_list_iterate_items_gen_safe(v, t, (head), list) /* - * Walk a list backwards, setting 'v' in turn to the containing structure + * Walk a list backwards, setting 'v' in turn to the containing structure * of each item. * The containing structure should be the same type as 'v'. * The 'struct dm_list' variable within the containing structure is 'field'. @@ -1383,7 +1383,7 @@ struct dm_list *dm_list_next(const struct dm_list *head, const struct dm_list *e v = dm_list_struct_base(v->field.p, __typeof__(*v), field)) /* - * Walk a list backwards, setting 'v' in turn to the containing structure + * Walk a list backwards, setting 'v' in turn to the containing structure * of each item. * The containing structure should be the same type as 'v'. * The list should be 'struct dm_list list' within the containing structure. @@ -1432,7 +1432,7 @@ int dm_split_words(char *buffer, unsigned max, unsigned ignore_comments, /* Not implemented */ char **argv); -/* +/* * Returns -1 if buffer too small */ int dm_snprintf(char *buf, size_t bufsize, const char *format, ...) @@ -1555,8 +1555,8 @@ typedef enum { * Set use_si_units to 1 for a suffix that does distinguish. */ const char *dm_size_to_string(struct dm_pool *mem, uint64_t size, - char unit_type, int use_si_units, - uint64_t unit_factor, int include_suffix, + char unit_type, int use_si_units, + uint64_t unit_factor, int include_suffix, dm_size_suffix_t suffix_type); /************************** @@ -1683,7 +1683,7 @@ int dm_timestamp_get(struct dm_timestamp *ts); /* * Compare two timestamps. - * + * * Return: -1 if ts1 is less than ts2 * 0 if ts1 is equal to ts2 * 1 if ts1 is greater than ts2

1 0

dev-prajnoha-pv-ext-flag-used - libdm: Whitespace.
by Peter Rajnoha 21 Aug '15

21 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=88551add9725ab9a… Commit: 88551add9725ab9a6866bce2cd1e4428078d76d1 Parent: 23e8e849e47284b3e5db815767d2d47765579986 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Wed Aug 5 05:11:42 2015 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Wed Aug 5 05:11:42 2015 +0100 libdm: Whitespace. --- libdm/libdm-report.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libdm/libdm-report.c b/libdm/libdm-report.c index 225da90..1c4d221 100644 --- a/libdm/libdm-report.c +++ b/libdm/libdm-report.c @@ -154,18 +154,18 @@ static struct op_def _op_cmp[] = { #define SEL_LIST_SUBSET_LE 0x00080000 static struct op_def _op_log[] = { - { "&&", SEL_AND, "All fields must match" }, + { "&&", SEL_AND, "All fields must match" }, { ",", SEL_AND, "All fields must match" }, - { "||", SEL_OR, "At least one field must match" }, + { "||", SEL_OR, "At least one field must match" }, { "#", SEL_OR, "At least one field must match" }, - { "!", SEL_MODIFIER_NOT, "Logical negation" }, - { "(", SEL_PRECEDENCE_PS, "Left parenthesis" }, - { ")", SEL_PRECEDENCE_PE, "Right parenthesis" }, - { "[", SEL_LIST_LS, "List start" }, - { "]", SEL_LIST_LE, "List end"}, - { "{", SEL_LIST_SUBSET_LS, "List subset start"}, - { "}", SEL_LIST_SUBSET_LE, "List subset end"}, - { NULL, 0, NULL}, + { "!", SEL_MODIFIER_NOT, "Logical negation" }, + { "(", SEL_PRECEDENCE_PS, "Left parenthesis" }, + { ")", SEL_PRECEDENCE_PE, "Right parenthesis" }, + { "[", SEL_LIST_LS, "List start" }, + { "]", SEL_LIST_LE, "List end"}, + { "{", SEL_LIST_SUBSET_LS, "List subset start"}, + { "}", SEL_LIST_SUBSET_LE, "List subset end"}, + { NULL, 0, NULL}, }; struct selection_str_list {

1 0

dev-prajnoha-pv-ext-flag-used - libdm: Sort new exported symbols.
by Peter Rajnoha 21 Aug '15

21 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=23e8e849e47284b3… Commit: 23e8e849e47284b3e5db815767d2d47765579986 Parent: 362a1a5a820c07c94d0bf4b512b32a47141564d9 Author: Alasdair G Kergon <agk(a)redhat.com> AuthorDate: Wed Aug 5 05:07:45 2015 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Wed Aug 5 05:07:45 2015 +0100 libdm: Sort new exported symbols. --- libdm/.exported_symbols.DM_1_02_104 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libdm/.exported_symbols.DM_1_02_104 b/libdm/.exported_symbols.DM_1_02_104 index 815c689..0039419 100644 --- a/libdm/.exported_symbols.DM_1_02_104 +++ b/libdm/.exported_symbols.DM_1_02_104 @@ -1,11 +1,11 @@ -dm_report_set_interval_ms -dm_report_set_interval_ns dm_report_get_interval_ms dm_report_get_interval_ns +dm_report_set_interval_ms +dm_report_set_interval_ns dm_report_wait dm_size_to_string dm_timestamp_alloc dm_timestamp_compare -dm_timestamp_get dm_timestamp_delta dm_timestamp_destroy +dm_timestamp_get

1 0

dev-prajnoha-pv-ext-flag-used - coverity: variable init must be done before its use
by Peter Rajnoha 21 Aug '15

21 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=1f3d04cddf5a447d… Commit: 1f3d04cddf5a447de9bfb81ed22d0ccbe58e82fc Parent: c78033233ab03749b37c01454310ac0c29fd5af8 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Aug 4 09:51:16 2015 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Aug 4 09:51:16 2015 +0200 coverity: variable init must be done before its use tools/polldaemon.c:465: uninit_use_in_call: Using uninitialized value "id.vg_name" when calling "print_log". tools/polldaemon.c:465: uninit_use_in_call: Using uninitialized value "id.lv_name" when calling "print_log". --- tools/polldaemon.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/polldaemon.c b/tools/polldaemon.c index 4527efb..83928b7 100644 --- a/tools/polldaemon.c +++ b/tools/polldaemon.c @@ -461,13 +461,14 @@ static int _lvmpolld_init_poll_vg(struct cmd_context *cmd, const char *vgname, if (!id.display_name && !lpdp->parms->aborting) continue; + id.vg_name = lv->vg->name; + id.lv_name = lv->name; + if (!*lv->lvid.s) { log_print_unless_silent("Missing LV uuid within: %s/%s", id.vg_name, id.lv_name); continue; } - id.vg_name = lv->vg->name; - id.lv_name = lv->name; id.uuid = lv->lvid.s; r = lvmpolld_poll_init(cmd, &id, lpdp->parms);

1 0

dev-prajnoha-pv-ext-flag-used - coverity: fix cppcheck warnings
by Peter Rajnoha 21 Aug '15

21 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=83541123c81b8ff1… Commit: 83541123c81b8ff129175963866d9fbd01c21e38 Parent: 46e6b2b86e58e081fa40e9cc724f09f03ecf843e Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Aug 4 09:33:55 2015 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Aug 4 09:33:55 2015 +0200 coverity: fix cppcheck warnings /lib/log/log.c:88: warning[invalidScanfArgType_int]: %llu in format string (no. 2) requires 'unsigned long long *' but the argument type is 'long long *'. daemons/lvmlockd/lvmlockd-core.c:791: error[uninitstring]: Dangerous usage of 'version' (strncpy doesn't always null-terminate it). --- daemons/lvmlockd/lvmlockd-core.c | 1 + lib/log/log.c | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c index 2f470f5..266339d 100644 --- a/daemons/lvmlockd/lvmlockd-core.c +++ b/daemons/lvmlockd/lvmlockd-core.c @@ -787,6 +787,7 @@ int version_from_args(char *args, unsigned int *major, unsigned int *minor, unsi char *n, *d1, *d2; strncpy(version, args, MAX_ARGS); + version[MAX_ARGS] = '\0'; n = strstr(version, ":"); if (n) diff --git a/lib/log/log.c b/lib/log/log.c index 9929090..bd11363 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -69,7 +69,7 @@ void init_log_file(const char *log_file, int append) static const char statfile[] = "/proc/self/stat"; const char *env; int pid; - long long starttime; + unsigned long long starttime; FILE *st; int i = 0;

1 0

dev-prajnoha-pv-ext-flag-used - coverity: fix possible resource leak in lvmpolld-core
by Peter Rajnoha 21 Aug '15

21 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=46e6b2b86e58e081… Commit: 46e6b2b86e58e081fa40e9cc724f09f03ecf843e Parent: 6ac5689ce4d4f86c4b3985d73a0fdb4af04c298d Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Tue Aug 4 09:25:40 2015 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Tue Aug 4 09:25:47 2015 +0200 coverity: fix possible resource leak in lvmpolld-core /daemons/lvmpolld/lvmpolld-core.c:573: leaked_storage: Variable "cmdargv" going out of scope leaks the storage it points to. --- daemons/lvmpolld/lvmpolld-core.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/daemons/lvmpolld/lvmpolld-core.c b/daemons/lvmpolld/lvmpolld-core.c index 1da2da2..1402373 100644 --- a/daemons/lvmpolld/lvmpolld-core.c +++ b/daemons/lvmpolld/lvmpolld-core.c @@ -566,6 +566,8 @@ static struct lvmpolld_lv *construct_pdlv(request req, struct lvmpolld_state *ls return NULL; } + pdlv->cmdargv = cmdargv; + cmdenvp = cmdenvp_ctr(pdlv); if (!cmdenvp) { pdlv_destroy(pdlv); @@ -573,7 +575,6 @@ static struct lvmpolld_lv *construct_pdlv(request req, struct lvmpolld_state *ls return NULL; } - pdlv->cmdargv = cmdargv; pdlv->cmdenvp = cmdenvp; return pdlv;

1 0

dev-prajnoha-pv-ext-flag-used - toolcontext: do not set cmd->initialized_connections = 0 on destroy_toolcontext
by Peter Rajnoha 21 Aug '15

21 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=b3997469b56eb54f… Commit: b3997469b56eb54f78fc84a8d9fde285ffd53c56 Parent: 519c309952245a0d6221a3297399a310acdb8144 Author: Peter Rajnoha <prajnoha(a)redhat.com> AuthorDate: Mon Aug 3 16:17:09 2015 +0200 Committer: Peter Rajnoha <prajnoha(a)redhat.com> CommitterDate: Mon Aug 3 16:17:17 2015 +0200 toolcontext: do not set cmd->initialized_connections = 0 on destroy_toolcontext The whole cmd context is freed completely in destroy_toolcontext, so do not write to any of dead cmd variables. --- lib/commands/toolcontext.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index f4c0c95..11affee 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -2179,7 +2179,6 @@ void destroy_toolcontext(struct cmd_context *cmd) lvmetad_release_token(); lvmetad_disconnect(); lvmpolld_disconnect(); - cmd->initialized.connections = 0; release_log_memory(); activation_exit();

1 0

dev-prajnoha-pv-ext-flag-used - dmsetup: Use argcp and argvp.
by Peter Rajnoha 21 Aug '15

21 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=519c309952245a0d… Commit: 519c309952245a0d6221a3297399a310acdb8144 Parent: a161e29c59e01605401c9096f5ad5ace2ae03d9a Author: Bryn M. Reeves <breeves(a)redhat.com> AuthorDate: Fri Jul 31 22:53:38 2015 +0100 Committer: Alasdair G Kergon <agk(a)redhat.com> CommitterDate: Fri Jul 31 22:53:38 2015 +0100 dmsetup: Use argcp and argvp. --- tools/dmsetup.c | 66 +++++++++++++++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tools/dmsetup.c b/tools/dmsetup.c index 4b23d72..bc71b35 100644 --- a/tools/dmsetup.c +++ b/tools/dmsetup.c @@ -3371,7 +3371,7 @@ error: return 0; } -static int _process_losetup_switches(const char *base, int *argc, char ***argv, +static int _process_losetup_switches(const char *base, int *argcp, char ***argvp, const char *dev_dir) { int c; @@ -3388,7 +3388,7 @@ static int _process_losetup_switches(const char *base, int *argc, char ***argv, optarg = 0; optind = OPTIND_INIT; - while ((c = GETOPTLONG_FN(*argc, *argv, "ade:fo:v", + while ((c = GETOPTLONG_FN(*argcp, *argvp, "ade:fo:v", long_options, NULL)) != -1 ) { if (c == ':' || c == '?') return 0; @@ -3406,8 +3406,8 @@ static int _process_losetup_switches(const char *base, int *argc, char ***argv, _switches[VERBOSE_ARG]++; } - *argv += optind ; - *argc -= optind ; + *argvp += optind ; + *argcp -= optind ; if (encrypt_loop){ fprintf(stderr, "%s: Sorry, cryptoloop is not yet implemented " @@ -3424,33 +3424,33 @@ static int _process_losetup_switches(const char *base, int *argc, char ***argv, if (find) { fprintf(stderr, "%s: Sorry, find is not yet implemented " "in this version.\n", base); - if (!*argc) + if (!*argcp) return 0; } - if (!*argc) { + if (!*argcp) { fprintf(stderr, "%s: Please specify loop_device.\n", base); _losetup_usage(stderr); return 0; } - if (!(device_name = parse_loop_device_name((*argv)[0], dev_dir))) { + if (!(device_name = parse_loop_device_name((*argvp)[0], dev_dir))) { fprintf(stderr, "%s: Could not parse loop_device %s\n", - base, (*argv)[0]); + base, (*argvp)[0]); _losetup_usage(stderr); return 0; } if (delete) { - *argc = 2; + *argcp = 2; - (*argv)[1] = device_name; - (*argv)[0] = (char *) "remove"; + (*argvp)[1] = device_name; + (*argvp)[0] = (char *) "remove"; return 1; } - if (*argc != 2) { + if (*argcp != 2) { fprintf(stderr, "%s: Too few arguments\n", base); _losetup_usage(stderr); dm_free(device_name); @@ -3458,9 +3458,9 @@ static int _process_losetup_switches(const char *base, int *argc, char ***argv, } /* FIXME move these to make them available to native dmsetup */ - if (!(loop_file = _get_abspath((*argv)[(find) ? 0 : 1]))) { + if (!(loop_file = _get_abspath((*argvp)[(find) ? 0 : 1]))) { fprintf(stderr, "%s: Could not parse loop file name %s\n", - base, (*argv)[1]); + base, (*argvp)[1]); _losetup_usage(stderr); dm_free(device_name); return 0; @@ -3469,14 +3469,14 @@ static int _process_losetup_switches(const char *base, int *argc, char ***argv, _table = dm_malloc(LOOP_TABLE_SIZE); if (!_table || !_loop_table(_table, (size_t) LOOP_TABLE_SIZE, loop_file, device_name, offset)) { - fprintf(stderr, "Could not build device-mapper table for %s\n", (*argv)[0]); + fprintf(stderr, "Could not build device-mapper table for %s\n", (*argvp)[0]); dm_free(device_name); return 0; } _switches[TABLE_ARG]++; - (*argv)[0] = (char *) "create"; - (*argv)[1] = device_name ; + (*argvp)[0] = (char *) "create"; + (*argvp)[1] = device_name ; return 1; } @@ -3525,7 +3525,7 @@ static int _process_options(const char *options) return 1; } -static int _process_switches(int *argc, char ***argv, const char *dev_dir) +static int _process_switches(int *argcp, char ***argvp, const char *dev_dir) { const char *base; char *namebase, *s; @@ -3593,7 +3593,7 @@ static int _process_switches(int *argc, char ***argv, const char *dev_dir) memset(&_int_args, 0, sizeof(_int_args)); _read_ahead_flags = 0; - if (!(namebase = strdup((*argv)[0]))) { + if (!(namebase = strdup((*argvp)[0]))) { fprintf(stderr, "Failed to duplicate name.\n"); return 0; } @@ -3608,28 +3608,28 @@ static int _process_switches(int *argc, char ***argv, const char *dev_dir) _switches[MINOR_ARG]++; _string_args[OPTIONS_ARG] = (char *) "name"; - if (*argc == 3) { - _int_args[MAJOR_ARG] = atoi((*argv)[1]); - _int_args[MINOR_ARG] = atoi((*argv)[2]); - *argc -= 2; - *argv += 2; - } else if ((*argc == 2) && - (2 == sscanf((*argv)[1], "%i:%i", + if (*argcp == 3) { + _int_args[MAJOR_ARG] = atoi((*argvp)[1]); + _int_args[MINOR_ARG] = atoi((*argvp)[2]); + *argcp -= 2; + *argvp += 2; + } else if ((*argcp == 2) && + (2 == sscanf((*argvp)[1], "%i:%i", &_int_args[MAJOR_ARG], &_int_args[MINOR_ARG]))) { - *argc -= 1; - *argv += 1; + *argcp -= 1; + *argvp += 1; } else { fprintf(stderr, "Usage: devmap_name <major> <minor>\n"); return 0; } - (*argv)[0] = (char *) "info"; + (*argvp)[0] = (char *) "info"; return 1; } if (!strcmp(base, "losetup") || !strcmp(base, "dmlosetup")){ - r = _process_losetup_switches(base, argc, argv, dev_dir); + r = _process_losetup_switches(base, argcp, argvp, dev_dir); free(namebase); return r; } @@ -3638,7 +3638,7 @@ static int _process_switches(int *argc, char ***argv, const char *dev_dir) optarg = 0; optind = OPTIND_INIT; - while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCfG:hj:m:M:no:O:rS:u:U:vy", + while ((ind = -1, c = GETOPTLONG_FN(*argcp, *argvp, "cCfG:hj:m:M:no:O:rS:u:U:vy", long_options, NULL)) != -1) { if (c == ':' || c == '?') return 0; @@ -3828,8 +3828,8 @@ static int _process_switches(int *argc, char ***argv, const char *dev_dir) return 0; } - *argv += optind; - *argc -= optind; + *argvp += optind; + *argcp -= optind; return 1; }

1 0

dev-prajnoha-pv-ext-flag-used - vgchange/lvchange: allow deactivation without locking
by Peter Rajnoha 21 Aug '15

21 Aug '15

Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=439a579aa2aaf13c… Commit: 439a579aa2aaf13c2e420b6e7888dbd71d7021c0 Parent: 649c9d47199feddf7f5b65b5dbe12918ba2b383b Author: David Teigland <teigland(a)redhat.com> AuthorDate: Fri Jul 31 14:11:24 2015 -0500 Committer: David Teigland <teigland(a)redhat.com> CommitterDate: Fri Jul 31 14:11:24 2015 -0500 vgchange/lvchange: allow deactivation without locking If locking with lvmlockd has failed, allow LVs to be deactivated. --- tools/lvchange.c | 4 +++- tools/vgchange.c | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/lvchange.c b/tools/lvchange.c index 823c36a..22a407a 100644 --- a/tools/lvchange.c +++ b/tools/lvchange.c @@ -1296,7 +1296,9 @@ int lvchange(struct cmd_context *cmd, int argc, char **argv) */ if (arg_count(cmd, activate_ARG) || arg_count(cmd, refresh_ARG)) { cmd->lockd_vg_default_sh = 1; - cmd->lockd_vg_enforce_sh = 1; + /* Allow deactivating if locks fail. */ + if (is_change_activating((activation_change_t)arg_uint_value(cmd, activate_ARG, CHANGE_AY))) + cmd->lockd_vg_enforce_sh = 1; } return process_each_lv(cmd, argc, argv, diff --git a/tools/vgchange.c b/tools/vgchange.c index a163cf5..7aecd98 100644 --- a/tools/vgchange.c +++ b/tools/vgchange.c @@ -204,7 +204,7 @@ int vgchange_activate(struct cmd_context *cmd, struct volume_group *vg, if (vg->system_id && vg->system_id[0] && cmd->system_id && cmd->system_id[0] && strcmp(vg->system_id, cmd->system_id) && - is_change_activating(activate)) { + do_activate) { log_error("Cannot activate LVs in a foreign VG."); return ECMD_FAILED; } @@ -1026,7 +1026,9 @@ static int _lockd_vgchange(struct cmd_context *cmd, int argc, char **argv) if (arg_is_set(cmd, activate_ARG) || arg_is_set(cmd, refresh_ARG)) { cmd->lockd_vg_default_sh = 1; - cmd->lockd_vg_enforce_sh = 1; + /* Allow deactivating if locks fail. */ + if (is_change_activating((activation_change_t)arg_uint_value(cmd, activate_ARG, CHANGE_AY))) + cmd->lockd_vg_enforce_sh = 1; } /* Starting a vg lockspace means there are no locks available yet. */

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
58
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

lvm2-commits August 2015