From 706c78a9c67e66da716ea7170b345f6aa641fb5e Mon Sep 17 00:00:00 2001 From: Yugo Nagata Date: Wed, 15 Jun 2016 15:24:21 +0900 Subject: [PATCH] Fix a posible hang during health checking Helath checking was hang when any data wasn't sent from backend after connect(2) succeeded. To fix this, pool_check_fd() returns 1 when select(2) exits with EINTR due to SIGALRM while health checkking is performed. Reported and patch provided by harukat and some modification by Yugo. Per bug #204. backported from 3.4 or later; https://git.postgresql.org/gitweb/?p=pgpool2.git;a=commitdiff;h=ed9f2900f1b611f5cfd52e8f758c3616861e60c0 --- pool_process_query.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pool_process_query.c b/pool_process_query.c index 09aad343a..3798edea9 100644 --- a/pool_process_query.c +++ b/pool_process_query.c @@ -1054,6 +1054,7 @@ int pool_check_fd(POOL_CONNECTION *cp) int fds; struct timeval timeout; struct timeval *timeoutp; + int save_errno; /* * If SSL is enabled, we need to check SSL internal buffer @@ -1083,8 +1084,15 @@ int pool_check_fd(POOL_CONNECTION *cp) FD_SET(fd, &exceptmask); fds = select(fd+1, &readmask, NULL, &exceptmask, timeoutp); + save_errno = errno; if (fds == -1) { + if (health_check_timer_expired && errno == EINTR) + { + pool_error("health check timed out while waiting for reading data"); + errno = save_errno; + return 1; + } if (errno == EAGAIN || errno == EINTR) continue; -- 2.39.5