diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-05-22 16:52:50 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-05-22 16:52:50 +0200 |
| commit | 17cac366ae5f31d07fc245bef702e6ec953e4cab (patch) | |
| tree | 1c9a65e5156702937169c8f332936bac142dafdd /src/basic/log.h | |
| parent | 8ca082b49ac816457dc258c297a96b2f623b152e (diff) | |
| download | systemd-17cac366ae5f31d07fc245bef702e6ec953e4cab.tar.gz systemd-17cac366ae5f31d07fc245bef702e6ec953e4cab.tar.bz2 systemd-17cac366ae5f31d07fc245bef702e6ec953e4cab.zip | |
nspawn: make sure our container PID 1 keeps logging to the original stderr as long as possible
If we log to the pty that is configured as stdin/stdout/stderr of the
container too early we risk filling it up in full before we start
processing the pty from the parent process, resulting in deadlocks.
Let's hence keep a copy of the original tty we were started on before
setting up stdin/stdout/stderr, so that we can log to it, and keep using
it as long as we can.
Since the kernel's pty internal buffer is pretty small this actually
triggered deadlocks when we debug logged at lot from nspawn's child
processes, see: https://github.com/systemd/systemd/pull/9024#issuecomment-390403674
With this change we won't use the pty at all, only the actual payload we
start will, and hence we won't deadlock on it, ever.
Diffstat (limited to 'src/basic/log.h')
| -rw-r--r-- | src/basic/log.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/basic/log.h b/src/basic/log.h index 63cfd298ec..6a8cf6375f 100644 --- a/src/basic/log.h +++ b/src/basic/log.h @@ -284,6 +284,8 @@ void log_set_open_when_needed(bool b); * stderr, the console or kmsg */ void log_set_prohibit_ipc(bool b); +int log_dup_console(void); + int log_syntax_internal( const char *unit, int level, |