From d183554c729b6da2a8658c5df85ceee054c699d0 Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Thu, 11 Aug 2011 15:27:46 +0000 Subject: [PATCH] Suppress locking error messages in monitoring init scripts. --- WHATS_NEW | 1 + lib/locking/locking.c | 2 +- scripts/lvm2_monitoring_init_red_hat.in | 1 + scripts/lvm2_monitoring_systemd_red_hat.service.in | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/WHATS_NEW b/WHATS_NEW index 9c53e390c..ef88c0ed0 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.87 - =============================== + Suppress locking error messages in monitoring init scripts. If pipe in clvmd fails, return busy instead of using uninitialised descriptors. Add dmeventd monitoring shared library for RAID. Add RAID metadata devices to considered devices in _add_lv_to_dtree. diff --git a/lib/locking/locking.c b/lib/locking/locking.c index 79a6d563d..ec8c08388 100644 --- a/lib/locking/locking.c +++ b/lib/locking/locking.c @@ -221,7 +221,7 @@ static void _update_vg_lock_count(const char *resource, uint32_t flags) */ int init_locking(int type, struct cmd_context *cmd, int suppress_messages) { - if (ignorelockingfailure() && getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES")) + if (getenv("LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES")) suppress_messages = 1; if (type < 0) diff --git a/scripts/lvm2_monitoring_init_red_hat.in b/scripts/lvm2_monitoring_init_red_hat.in index 4812c750f..0988511fb 100644 --- a/scripts/lvm2_monitoring_init_red_hat.in +++ b/scripts/lvm2_monitoring_init_red_hat.in @@ -42,6 +42,7 @@ VGS=${sbindir}/vgs LOCK_FILE="/var/lock/subsys/$DAEMON" WARN=1 +export LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1 start() { diff --git a/scripts/lvm2_monitoring_systemd_red_hat.service.in b/scripts/lvm2_monitoring_systemd_red_hat.service.in index 47154169f..b5dd9bb4e 100644 --- a/scripts/lvm2_monitoring_systemd_red_hat.service.in +++ b/scripts/lvm2_monitoring_systemd_red_hat.service.in @@ -8,6 +8,7 @@ Conflicts=shutdown.target [Service] Type=oneshot +Environment=LVM_SUPPRESS_LOCKING_FAILURE_MESSAGES=1 ExecStart=@sbindir@/lvm vgchange --monitor y ExecStop=@sbindir@/lvm vgchange --monitor n RemainAfterExit=yes -- 2.43.5