fix #2184: filter lvs from guests

Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>

diff --git a/patchdir/0002-enable-issue_discards-by-default.patch b/patchdir/0002-enable-issue_discards-by-default.patch
deleted file mode 100644 (file)
index ac66732..0000000
--- a/patchdir/0002-enable-issue_discards-by-default.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 829981232ec0ec4e8b2cae15d3fb940907feb28f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
-Date: Fri, 17 Mar 2017 11:59:54 +0100
-Subject: [PATCH 2/6] enable issue_discards by default
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
----
- conf/example.conf.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/conf/example.conf.in b/conf/example.conf.in
-index 1a8a67b..56b0795 100644
---- a/conf/example.conf.in
-+++ b/conf/example.conf.in
-@@ -301,7 +301,7 @@ devices {
-       # benefit from discards, but SSDs and thinly provisioned LUNs
-       # generally do. If enabled, discards will only be issued if both the
-       # storage and kernel provide support.
--      issue_discards = 0
-+      issue_discards = 1
- 
-       # Configuration option devices/allow_changes_with_duplicate_pvs.
-       # Allow VG modification while a PV appears on multiple devices.
--- 
-2.14.1
-

diff --git a/patchdir/0002-fix-2184-filter-lvs-from-guests.patch b/patchdir/0002-fix-2184-filter-lvs-from-guests.patch
new file mode 100644 (file)
index 0000000..cf72538
--- /dev/null
+++ b/patchdir/0002-fix-2184-filter-lvs-from-guests.patch
@@ -0,0 +1,27 @@
+From a91e2f0d45b3f11d4cf25f769e5daeb0f8a83fb7 Mon Sep 17 00:00:00 2001
+From: Oguz Bektas <o.bektas@proxmox.com>
+Date: Fri, 12 Jul 2019 13:00:15 +0200
+Subject: [PATCH] fix #2184: filter lvs from guests
+
+Signed-off-by: Oguz Bektas <o.bektas@proxmox.com>
+---
+ conf/example.conf.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/conf/example.conf.in b/conf/example.conf.in
+index 009a442ed..78073569a 100644
+--- a/conf/example.conf.in
++++ b/conf/example.conf.in
+@@ -125,7 +125,8 @@ devices {
+       # Run vgscan after changing the filter to regenerate the cache.
+       # 
+       # Do not scan ZFS zvols (to avoid problems on ZFS zvols snapshots)
+-      global_filter = [ "r|/dev/zd.*|", "r|/dev/mapper/pve-.*|" ]
++      # Also do not scan LVM disks from guests
++      global_filter = [ "r|/dev/zd.*|", "r|/dev/mapper/pve-.*|" "r|/dev/mapper/.*-vm--[0-9]+--disk--[0-9]+|"]
+ 
+       # Example
+       # Accept every block device:
+-- 
+2.20.1
+

diff --git a/patchdir/0003-enable-issue_discards-by-default.patch b/patchdir/0003-enable-issue_discards-by-default.patch
new file mode 100644 (file)
index 0000000..ac66732
--- /dev/null
+++ b/patchdir/0003-enable-issue_discards-by-default.patch
@@ -0,0 +1,29 @@
+From 829981232ec0ec4e8b2cae15d3fb940907feb28f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Fri, 17 Mar 2017 11:59:54 +0100
+Subject: [PATCH 2/6] enable issue_discards by default
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ conf/example.conf.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/conf/example.conf.in b/conf/example.conf.in
+index 1a8a67b..56b0795 100644
+--- a/conf/example.conf.in
++++ b/conf/example.conf.in
+@@ -301,7 +301,7 @@ devices {
+       # benefit from discards, but SSDs and thinly provisioned LUNs
+       # generally do. If enabled, discards will only be issued if both the
+       # storage and kernel provide support.
+-      issue_discards = 0
++      issue_discards = 1
+ 
+       # Configuration option devices/allow_changes_with_duplicate_pvs.
+       # Allow VG modification while a PV appears on multiple devices.
+-- 
+2.14.1
+

diff --git a/patchdir/series b/patchdir/series
index cb43ddcabaebfd94bbdbfbc629f4d7c528420f47..b63618d11c20903853dc25082734e73284a18dc3 100644 (file)
--- a/patchdir/series
+++ b/patchdir/series
@@ -1,4 +1,5 @@
 0001-filter-zvols-and-PVE-VG-by-default.patch
-0002-enable-issue_discards-by-default.patch
+0002-fix-2184-filter-lvs-from-guests.patch
+0003-enable-issue_discards-by-default.patch
 0006-disable-init-scripts.patch
 udev-do-not-overwrite-ID_MODEL-in-69-dm-lvm-metad.rules.patch