mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-28 14:21:00 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: namespace: close open namespaces during soft shutdown

Browse Source 
When doing a soft shutdown, we won't be making new connections anymore so
there's no point in keeping the namespace file descriptors open anymore.

Keeping these open effectively makes it impossible to properly clean up
namespaces which are no longer used in the new configuration until all
previously opened connections are closed in the old worker process.

This change introduces a cleanup function that is called during soft shutdown
that closes all namespace file descriptors by iterating over the namespace
ebtree.
This commit is contained in:
Krisztian Kovacs 2019-09-24 14:12:13 +02:00 committed by Willy Tarreau
parent cec60056e4
commit 710d987cd6
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/namespace.c
View File

@ -15,6 +15,7 @@
#include <common/hash.h>
#include <common/errors.h>
#include <proto/log.h>
#include <proto/signal.h>
#include <types/global.h>
/* Opens the namespace <ns_name> and returns the FD or -1 in case of error
@ -39,6 +40,24 @@ static int init_default_namespace()
static struct eb_root namespace_tree_root = EB_ROOT;
static void netns_sig_stop(struct sig_handler *sh)
{
struct ebpt_node *node, *next;
struct netns_entry *entry;
/* close namespace file descriptors and remove registered namespaces from the
* tree when stopping */
node = ebpt_first(&namespace_tree_root);
while (node) {
next = ebpt_next(node);
ebpt_delete(node);
entry = container_of(node, struct netns_entry, node);
free(entry->node.key);
close(entry->fd);
node = next;
}
}
int netns_init(void)
{
int err_code = 0;
@ -55,6 +74,8 @@ int netns_init(void)
}
}
signal_register_fct(0, netns_sig_stop, 0);
return err_code;
}