New jail level - kill - used when killing is happening

A new jail level, JAIL_MASTER_KILL, is introduced. The mgt process takes this level before killing the child process. Fixes: #2010
varnishcache · Oct 12, 2016 · 61cdc9d · 61cdc9d
1 parent f9526a5
commit 61cdc9d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/bin/varnishd/mgt/mgt.h b/bin/varnishd/mgt/mgt.h
@@ -82,6 +82,7 @@ enum jail_master_e {
 	JAIL_MASTER_FILE,
 	JAIL_MASTER_STORAGE,
 	JAIL_MASTER_PRIVPORT,
+	JAIL_MASTER_KILL,
 };
 
 typedef int jail_init_f(char **);

diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
@@ -459,10 +459,17 @@ mgt_launch_child(struct cli *cli)
 
 static int
 kill_child(void) {
+	int i, error;
+
+	VJ_master(JAIL_MASTER_KILL);
 	if (MGT_FEATURE(FEATURE_NO_COREDUMP))
-		return (kill(child_pid, SIGKILL));
+		i = kill(child_pid, SIGKILL);
 	else
-		return (kill(child_pid, SIGQUIT));
+		i = kill(child_pid, SIGQUIT);
+	error = errno;
+	VJ_master(JAIL_MASTER_LOW);
+	errno = error;
+	return (i);
 }
 
 static void