From e3d360d0d47569c1470883be52b9264a914b6b6bd5249a7cca7b42fbf0a8fb62 Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Tue, 4 Mar 2014 19:05:01 +0000 Subject: [PATCH] - Improve lock manager comments in qemu.conf Updated suse-qemu-conf.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=357 --- libvirt.changes | 6 ++++++ suse-qemu-conf.patch | 35 ++++++++++++++++++++++++----------- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/libvirt.changes b/libvirt.changes index 142c865..c93f200 100644 --- a/libvirt.changes +++ b/libvirt.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 4 11:43:25 MST 2014 - jfehlig@suse.com + +- Improve lock manager comments in qemu.conf + Updated suse-qemu-conf.patch + ------------------------------------------------------------------- Tue Mar 4 17:03:47 UTC 2014 - speilicke@suse.com diff --git a/suse-qemu-conf.patch b/suse-qemu-conf.patch index 57b63ce..095e46c 100644 --- a/suse-qemu-conf.patch +++ b/suse-qemu-conf.patch @@ -19,19 +19,32 @@ Index: libvirt-1.2.2/src/qemu/qemu.conf # If set to non-zero, then the default security labeling # will make guests confined. If set to zero, then guests -@@ -402,6 +411,15 @@ +@@ -402,10 +411,25 @@ #allow_disk_format_probing = 1 +-# To enable 'Sanlock' project based locking of the file +-# content (to prevent two VMs writing to the same +-# disk), uncomment this +# SUSE note: -+# Many lock managers, sanlock included, will kill the resources -+# they protect when terminated. E.g. the sanlock daemon will kill -+# any virtual machines for which it holds disk leases when the -+# daemon is stopped or restarted. Administrators must be vigilant -+# when enabling a lock manager since simply updating the manager -+# may cause it to be restarted, potentially killing the resources -+# it protects. ++# Two lock managers are supported: lockd and sanlock. lockd, which ++# is provided by the virtlockd service, uses advisory locks (flock(2)) ++# to protect virtual machine disks. sanlock uses the notion of leases ++# to protect virtual machine disks and is more appropriate in a SAN ++# environment. +# - # To enable 'Sanlock' project based locking of the file - # content (to prevent two VMs writing to the same - # disk), uncomment this ++# For most deployments that require virtual machine disk protection, ++# lockd is recommended since it is easy to configure and the virtlockd ++# service can be restarted without terminating any running virtual ++# machines. sanlock, which may be preferred in some SAN environments, ++# has the disadvantage of not being able to be restarted without ++# first terminating all virtual machines for which it holds leases. ++# ++# To enable lockd or sanlock based protection of virtual machine disk ++# content (to prevent two VMs writing to the same disk), uncomment one ++# of the following + # ++#lock_manager = "lockd" + #lock_manager = "sanlock" + +