summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Rajnoha <prajnoha@redhat.com>2014-10-14 09:56:58 +0200
committerPeter Rajnoha <prajnoha@redhat.com>2014-10-14 10:08:23 +0200
commit02628413ca99648e70e38406384be69e20a2a6ce (patch)
treeaf699407aca11912fa592e514a91d7b7c526feea
parentd1bcdd7338148a887aae44149e3ea756c1df17a3 (diff)
downloadlvm2-02628413ca99648e70e38406384be69e20a2a6ce.tar.gz
systemd: remove workaround for lvm2-monitor.service's ExecStop line
Bug https://bugzilla.redhat.com/show_bug.cgi?id=843587 is handled better now - the hang does not occur anymore. There are still error messages issued though during shutdown if someone stops lvm2-lvmetad.service manually that lvm2-monitor.service depends on (even during shutdown). These errors are correct though and will point to incorrect configuration (still having use_lvmetad=1 in lvm.conf and stopping lvm2-lvmetad.service manually). The workaround to prevent the hang is not needed now. So the '--config "global{use_lvmetad=0}"' is now removed from the lvm2-monitor.service's ExecStop line.
-rw-r--r--WHATS_NEW1
-rw-r--r--scripts/lvm2_monitoring_systemd_red_hat.service.in3
2 files changed, 2 insertions, 2 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index 8511a4538..2a0adf45e 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.112 -
=====================================
+ Remove workaround for lvm2-monitor.service hang on stop if lvmetad stopped.
Change vgremove to use process_each_lv_in_vg.
Introduce WARN_ flags to control some metadata warning messages.
Use process_each_pv in vgreduce.
diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in
index 05f911b1d..bb52f0d56 100644
--- a/scripts/lvm2_monitoring_systemd_red_hat.service.in
+++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in
@@ -11,8 +11,7 @@ Conflicts=shutdown.target
Type=oneshot
Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1
ExecStart=@sbindir@/lvm vgchange --monitor y --ignoreskippedcluster
-# The lvmetad must be disabled here, it needs https://bugzilla.redhat.com/show_bug.cgi?id=843587 to be resolved first.
-ExecStop=@sbindir@/lvm vgchange --monitor n --config 'global{use_lvmetad=0}' --ignoreskippedcluster
+ExecStop=@sbindir@/lvm vgchange --monitor n --ignoreskippedcluster
RemainAfterExit=yes
[Install]