From 4300f26492b2438c4c1930552dfe83cb09c0ab31 Mon Sep 17 00:00:00 2001 From: Dexuan Cui Date: Wed, 19 Nov 2014 21:51:22 -0800 Subject: tools: hv: ignore ENOBUFS and ENOMEM in the KVP daemon Under high memory pressure and very high KVP R/W test pressure, the netlink recvfrom() may transiently return ENOBUFS to the daemon -- we found this during a 2-week stress test. We'd better not terminate the daemon on the failure, because a typical KVP user will re-try the R/W and hopefully it will succeed next time. We can also ignore the errors on sending. Cc: K. Y. Srinivasan Signed-off-by: Dexuan Cui Reviewed-by: Vitaly Kuznetsov Signed-off-by: Greg Kroah-Hartman --- tools/hv/hv_kvp_daemon.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'tools/hv') diff --git a/tools/hv/hv_kvp_daemon.c b/tools/hv/hv_kvp_daemon.c index 22b076419c80..6a6432a20a1d 100644 --- a/tools/hv/hv_kvp_daemon.c +++ b/tools/hv/hv_kvp_daemon.c @@ -1559,8 +1559,15 @@ int main(int argc, char *argv[]) addr_p, &addr_l); if (len < 0) { + int saved_errno = errno; syslog(LOG_ERR, "recvfrom failed; pid:%u error:%d %s", addr.nl_pid, errno, strerror(errno)); + + if (saved_errno == ENOBUFS) { + syslog(LOG_ERR, "receive error: ignored"); + continue; + } + close(fd); return -1; } @@ -1763,8 +1770,15 @@ kvp_done: len = netlink_send(fd, incoming_cn_msg); if (len < 0) { + int saved_errno = errno; syslog(LOG_ERR, "net_link send failed; error: %d %s", errno, strerror(errno)); + + if (saved_errno == ENOMEM || saved_errno == ENOBUFS) { + syslog(LOG_ERR, "send error: ignored"); + continue; + } + exit(EXIT_FAILURE); } } -- cgit v1.2.3-59-g8ed1b