During syslog reconnect we lose nonblock flag. This leads to misbehavior
while logging. Tarantool hangs forever
Closes #3615
---
https://github.com/tarantool/tarantool/issues/3615
https://github.com/tarantool/tarantool/tree/OKriw/gh-3615-loss-nonblock-1.10
src/say.c | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/say.c b/src/say.c
index 063e0295c..4bd47b1f2 100644
--- a/src/say.c
+++ b/src/say.c
@@ -238,6 +238,16 @@ write_to_file(struct log *log, int total);
static void
write_to_syslog(struct log *log, int total);
+static void
+set_nonblock(int fd)
+{
+ int flags;
+ if ( (flags = fcntl(fd, F_GETFL, 0)) < 0 ||
+ fcntl(fd, F_SETFL, flags | O_NONBLOCK) < 0) {
+ say_syserror("fcntl, fd=%i", fd);
+ }
+}
+
/**
* Rotate logs on SIGHUP
*/
@@ -262,13 +272,9 @@ 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);
- }
- }
+ if (log->nonblock)
+ set_nonblock(log->fd);
+
/* We are in ev signal handler
* so we don't have to be worry about async signal safety
*/
@@ -940,6 +946,8 @@ write_to_syslog(struct log *log, int total)
close(log->fd);
log->fd = log_syslog_connect(log);
if (log->fd >= 0) {
+ if (log->nonblock)
+ set_nonblock(log->fd);
/*
* In a case or error the log message is
* lost. We can not wait for connection -
--
2.14.3 (Apple Git-98)
