From 8a4f9cab7d08bf13ac794fa2800a37c59ac14728 Mon Sep 17 00:00:00 2001 From: Nikolay Shirokovskiy Date: Thu, 24 Sep 2020 15:54:24 +0300 Subject: [PATCH 033/108] logging: fix endless loop on EOF On EOF condition we always have POLLHUP event and read returns 0 thus we never break loop in virLogHandlerDomainLogFileDrain. Signed-off-by: Nikolay Shirokovskiy Reviewed-by: Michal Privoznik (cherry picked from commit bde9e2c6c018f79d8e3b0bd30ea7aa80dcc9e435) --- src/logging/log_handler.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 87748d96d1..3cc197a396 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -464,6 +464,8 @@ virLogHandlerDomainLogFileDrain(virLogHandlerLogFilePtr file) if (errno == EINTR) continue; return; + } else if (len == 0) { + return; } if (virRotatingFileWriterAppend(file->file, buf, len) != len) -- 2.33.0