Commit 2c33da50 authored by Jan Moskyto Matejka's avatar Jan Moskyto Matejka
Browse files

Netlink: fix occasional netlink hangs on busy machines

parent 7d95c445
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -1497,6 +1497,7 @@ nl_async_hook(sock *sk, uint size UNUSED)
	   *  One day we might react to it by asking for route table
	   *  One day we might react to it by asking for route table
	   *  scan in near future.
	   *  scan in near future.
	   */
	   */
	  log(L_WARN "Kernel dropped some netlink messages, will resync on next scan.");
	  return 1;	/* More data are likely to be ready */
	  return 1;	/* More data are likely to be ready */
	}
	}
      else if (errno != EWOULDBLOCK)
      else if (errno != EWOULDBLOCK)
+2 −1
Original line number Original line Diff line number Diff line
@@ -2238,6 +2238,7 @@ io_loop(void)
	      if (pfd[s->index].revents & (POLLHUP | POLLERR))
	      if (pfd[s->index].revents & (POLLHUP | POLLERR))
		{
		{
		  sk_err(s, pfd[s->index].revents);
		  sk_err(s, pfd[s->index].revents);
		  if (s != current_sock)
		    goto next2;
		    goto next2;
		}
		}