shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

generators: avoid contacting syslog with generators

Browse Source 
The systemd generators are executed very early during the switch
from initramfs to system partition and the syslog is not yet fully
operational - it may cause blocking, if some debug logging is enabled
at the same time in /etc/lvm/lvm.conf log{} section.

To avoid timeouting and killing this generator - rather enhance lvm
code to suppress any syslog communication when LVM_SUPPRESS_SYSLOG
envvar is set.

Use of this envvar is needed since the parsing of i.e. cmdline options
that could eventually override lvm.conf setting happens in this case
way too late and number of lines could have been already streamed to
syslog.
This commit is contained in:
Zdenek Kabelac 2019-01-07 15:48:39 +01:00
parent 6298eaeca5
commit fdd612b824
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.03.02 - Version 2.03.02 -
=================================== ===================================
Introduce LVM_SUPPRESS_SYSLOG to suppress syslog usage by generator.
Fix generator quering lvmconfig unpresent config option. Fix generator quering lvmconfig unpresent config option.
Fix memleak on bcache error path code. Fix memleak on bcache error path code.
Fix missing unlock on lvm2 dmeventd plugin error path initialization. Fix missing unlock on lvm2 dmeventd plugin error path initialization.

3
lib/log/log.c
View File

@ -324,6 +324,9 @@ void init_log_while_suspended(int log_while_suspended)
void init_syslog(int facility) void init_syslog(int facility)
{ {
if (getenv("LVM_SUPPRESS_SYSLOG"))
return;
openlog("lvm", LOG_PID, facility); openlog("lvm", LOG_PID, facility);
_syslog = 1; _syslog = 1;
} }

3
man/lvm.8_main
View File

@ -435,6 +435,9 @@ Defaults to "\fI#DEFAULT_SYS_DIR#\fP".
.B LVM_SUPPRESS_FD_WARNINGS .B LVM_SUPPRESS_FD_WARNINGS
Suppress warnings about unexpected file descriptors passed into LVM. Suppress warnings about unexpected file descriptors passed into LVM.
.TP .TP
.B LVM_SUPPRESS_SYSLOG
Suppress contacting syslog.
.TP
.B LVM_VG_NAME .B LVM_VG_NAME
The Volume Group name that is assumed for The Volume Group name that is assumed for
any reference to a Logical Volume that doesn't specify a path. any reference to a Logical Volume that doesn't specify a path.

3
scripts/generator-internals.c
View File

@ -72,6 +72,9 @@ static bool _open_child(struct child_process *child, const char *cmd, const char
(void) close(pipe_fd[1]); (void) close(pipe_fd[1]);
} }
/* Suppressing any use of syslog */
(void) setenv("LVM_SUPPRESS_SYSLOG", "1", 1);
if (execv(cmd, (char *const *) argv) < 0) if (execv(cmd, (char *const *) argv) < 0)
_error("execv failed: %s\n", strerror(errno)); _error("execv failed: %s\n", strerror(errno));
// Shouldn't get here unless exec failed. // Shouldn't get here unless exec failed.