[6.0] ca76ef579 fix the missing high fd tracking

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Feb 6 10:11:10 UTC 2019


commit ca76ef579f34394078ce281955b835958d3d8dfe
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Thu Nov 22 13:44:50 2018 +0100

    fix the missing high fd tracking

diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index 3e1abc9f3..8e2494ac8 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -191,6 +191,8 @@ mch_cli_panic_clear(struct cli *cli, const char * const *av, void *priv)
 static int		mgt_max_fd;
 
 #define CLOSE_FD_UP_TO	(mgt_max_fd + 100)
+// XXX should work now - engage?
+//#define CLOSE_FD_UP_TO	mgt_max_fd
 #define CHECK_FD_UP_TO	(CLOSE_FD_UP_TO + 100)
 
 void
@@ -215,6 +217,7 @@ MCH_Fd_Inherit(int fd, const char *what)
 {
 
 	assert(fd >= 0);
+	MCH_TrackHighFd(fd);
 	if (fd_map == NULL)
 		fd_map = vbit_new(128);
 	AN(fd_map);


More information about the varnish-commit mailing list