From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 795F228678 for ; Mon, 13 Aug 2018 02:38:47 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zIKiAMTkFWb9 for ; Mon, 13 Aug 2018 02:38:47 -0400 (EDT) Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 1D27628676 for ; Mon, 13 Aug 2018 02:38:46 -0400 (EDT) Received: by mail-lf1-f65.google.com with SMTP id n96-v6so10442682lfi.1 for ; Sun, 12 Aug 2018 23:38:46 -0700 (PDT) From: Olga Arkhangelskaia Subject: [tarantool-patches] [PATCH v2] Fix O_NONBLOCK flag loss Date: Mon, 13 Aug 2018 09:37:58 +0300 Message-Id: <20180813063758.40876-1-krishtal.olja@gmail.com> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-subscribe: List-owner: List-post: List-archive: To: tarantool-patches@freelists.org Cc: Olga Arkhangelskaia During syslog reconnect we lose nonblock flag. This leads to misbehavior while logging. Tarantool hangs forever. Test for this fix will be available in 1.10. Closes #3615 --- https://github.com/tarantool/tarantool/issues/3615 https://github.com/tarantool/tarantool/tree/OKriw/gh-3615-loss-nonblock-1.9 v1: https://www.freelists.org/post/tarantool-patches/PATCH-Fix-O-NONBLOCK-flag-loss Changes in v2: -rebased on 1.9 -changed set_nonblock arg -set flag in one more place src/say.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/say.c b/src/say.c index 063e0295c..9c1066efc 100644 --- a/src/say.c +++ b/src/say.c @@ -238,6 +238,23 @@ write_to_file(struct log *log, int total); static void write_to_syslog(struct log *log, int total); +/** + * Sets O_NONBLOCK flag in case if lognonblock is set. + */ +static void +set_nonblock(struct log *log) +{ + if (!log->nonblock) + return; + else { + int flags; + if ((flags = fcntl(log->fd, F_GETFL, 0)) < 0 || + fcntl(log->fd, F_SETFL, flags | O_NONBLOCK) < 0) { + say_syserror("fcntl, fd=%i", log->fd); + } + } +} + /** * Rotate logs on SIGHUP */ @@ -262,13 +279,8 @@ log_rotate(struct log *log) dup2(fd, log->fd); close(fd); - if (log->nonblock) { - int flags; - if ( (flags = fcntl(log->fd, F_GETFL, 0)) < 0 || - fcntl(log->fd, F_SETFL, flags | O_NONBLOCK) < 0) { - say_syserror("fcntl, fd=%i", log->fd); - } - } + set_nonblock(log); + /* We are in ev signal handler * so we don't have to be worry about async signal safety */ @@ -567,12 +579,7 @@ log_create(struct log *log, const char *init_str, bool nonblock) * non-blocking: this will garble interactive * console output. */ - if (log->nonblock) { - int flags; - if ( (flags = fcntl(log->fd, F_GETFL, 0)) < 0 || - fcntl(log->fd, F_SETFL, flags | O_NONBLOCK) < 0) - say_syserror("fcntl, fd=%i", log->fd); - } + set_nonblock(log); } else { log->type = SAY_LOGGER_STDERR; log->fd = STDERR_FILENO; @@ -940,6 +947,7 @@ write_to_syslog(struct log *log, int total) close(log->fd); log->fd = log_syslog_connect(log); if (log->fd >= 0) { + set_nonblock(log); /* * In a case or error the log message is * lost. We can not wait for connection - -- 2.14.3 (Apple Git-98)