-From 9133a3b85cc8105dd37b266a8223a44d1c881318 Mon Sep 17 00:00:00 2001
+From 65e9206964c546842ccd8cc8c7885b4feb66c429 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:25 +0100
-Subject: [PATCH 1/4] filter zvols and PVE VG by default
+Subject: [PATCH 1/6] filter zvols and PVE VG by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-From d3cd068c29b356b1b21a013e039d017d7d714f0e Mon Sep 17 00:00:00 2001
+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/4] enable issue_discards by default
+Subject: [PATCH 2/6] enable issue_discards by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
-From 9940c2f754e3292b6d96628682c254941ae6cc58 Mon Sep 17 00:00:00 2001
+From 2d388d787ea9100da535dd5f7e57a6802f4567ba Mon Sep 17 00:00:00 2001
From: Zdenek Kabelac <zkabelac@redhat.com>
Date: Wed, 4 Oct 2017 13:58:21 +0200
-Subject: [PATCH] dmeventd: schedule exit on break
+Subject: [PATCH 4/6] dmeventd: schedule exit on break
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
When dmeventd receives SIGTERM/INT/HUP/QUIT it validates if exit is possible.
If there was any device still monitored, such exit request used to
cherry picked from commit 9940c2f754e3292b6d96628682c254941ae6cc58
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
daemons/dmeventd/dmeventd.c | 13 ++++++++-----
- 1 files changed, 8 insertions(+), 5 deletions(-)
+ 1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/daemons/dmeventd/dmeventd.c b/daemons/dmeventd/dmeventd.c
-index 3a92ab6..cc520d3 100644
+index 1565b80..a16cb1f 100644
--- a/daemons/dmeventd/dmeventd.c
+++ b/daemons/dmeventd/dmeventd.c
@@ -62,6 +62,8 @@
log_info("dmeventd detected break while being idle "
"for %ld second(s), exiting.",
(long) (time(NULL) - _idle_since));
-@@ -2264,15 +2268,14 @@ int main(int argc, char *argv[])
+@@ -2263,15 +2267,14 @@ int main(int argc, char *argv[])
break;
}
}
_process_request(&fifos);
_cleanup_unused_threads();
--
-2.9.3
+2.14.1
+
+++ /dev/null
-From a781b1c1788461595f382918bb1fc210d248d444 Mon Sep 17 00:00:00 2001
-From: Thomas Lamprecht <t.lamprecht@proxmox.com>
-Date: Thu, 5 Oct 2017 12:52:15 +0200
-Subject: [PATCH] dmeventd: ensure systemd service gets stopped on shutdown
-
-Add these for dmeventd systemd unit (dm-event.service):
-
- Before: shutdown.target
- Conflicts: shutdown.target
-
-This will cause the dmeventd to be properly stopped at shutdown (after
-all the dmeventd clients unregistered their devices from monitoring)
-with dm-event.service's stop action (there's no direct action defined
-for the "stop" so systemd sends SIGTERM instead).
-
-Before, we let dmeventd to get killed only as part of the very last
-SIGTERM/SIGKILL for all the remaining processes late in the shutdown
-sequence so we may have missed some logs if dmeventd encountered an
-error during its shutdown (logging facilities are already off at this
-late time in shutdown sequence).
-
-Ref: https://www.redhat.com/archives/lvm-devel/2017-October/msg00000.html
-
-cherry picked from commit a781b1c1788461595f382918bb1fc210d248d444
-
-Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
----
- scripts/dm_event_systemd_red_hat.service.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/scripts/dm_event_systemd_red_hat.service.in b/scripts/dm_event_systemd_red_hat.service.in
-index 7c607aa..4924d39 100644
---- a/scripts/dm_event_systemd_red_hat.service.in
-+++ b/scripts/dm_event_systemd_red_hat.service.in
-@@ -3,7 +3,8 @@ Description=Device-mapper event daemon
- Documentation=man:dmeventd(8)
- Requires=dm-event.socket
- After=dm-event.socket
--Before=local-fs-pre.target
-+Before=local-fs-pre.target shutdown.target
-+Conflicts=shutdown.target
- DefaultDependencies=no
-
- [Service]
---
-2.9.3
--- /dev/null
+From e47ceabaa07f5705a80f66f98f2639b562b90793 Mon Sep 17 00:00:00 2001
+From: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Date: Thu, 5 Oct 2017 12:52:15 +0200
+Subject: [PATCH 5/6] dmeventd: ensure systemd service gets stopped on shutdown
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Add these for dmeventd systemd unit (dm-event.service):
+
+ Before: shutdown.target
+ Conflicts: shutdown.target
+
+This will cause the dmeventd to be properly stopped at shutdown (after
+all the dmeventd clients unregistered their devices from monitoring)
+with dm-event.service's stop action (there's no direct action defined
+for the "stop" so systemd sends SIGTERM instead).
+
+Before, we let dmeventd to get killed only as part of the very last
+SIGTERM/SIGKILL for all the remaining processes late in the shutdown
+sequence so we may have missed some logs if dmeventd encountered an
+error during its shutdown (logging facilities are already off at this
+late time in shutdown sequence).
+
+Ref: https://www.redhat.com/archives/lvm-devel/2017-October/msg00000.html
+
+cherry picked from commit a781b1c1788461595f382918bb1fc210d248d444
+
+Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+---
+ scripts/dm_event_systemd_red_hat.service.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/scripts/dm_event_systemd_red_hat.service.in b/scripts/dm_event_systemd_red_hat.service.in
+index 7c607aa..4924d39 100644
+--- a/scripts/dm_event_systemd_red_hat.service.in
++++ b/scripts/dm_event_systemd_red_hat.service.in
+@@ -3,7 +3,8 @@ Description=Device-mapper event daemon
+ Documentation=man:dmeventd(8)
+ Requires=dm-event.socket
+ After=dm-event.socket
+-Before=local-fs-pre.target
++Before=local-fs-pre.target shutdown.target
++Conflicts=shutdown.target
+ DefaultDependencies=no
+
+ [Service]
+--
+2.14.1
+
-From 2f1ea95b944a8b4ffa12a0d5bfb8d2aa9f71c365 Mon Sep 17 00:00:00 2001
+From 0a3eb4ba7dc2554e71319e95ad61bd8611cc0c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
Date: Mon, 9 Oct 2017 13:05:31 +0200
Subject: [PATCH 6/6] disable init scripts
0002-enable-issue_discards-by-default.patch
0003-disable-use-lvmetad.patch
0004-dmeventd-schedule-exit-on-break.patch
-0005-dmeventd-ensure-service-gets-stopped-on-shutdown.patch
+0005-dmeventd-ensure-systemd-service-gets-stopped-on-shut.patch
0006-disable-init-scripts.patch
projects / lvm.git / commitdiff