From 79ea54b21dff0baaaaa8f83a60557c0be642e49e Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Mon, 20 Jan 2020 11:48:27 +0100 Subject: [PATCH] Allow to kill keepalived state change monitor process Usually Neutron stops neutron-keepalived-state-change-monitor process gracefully with SIGTERM. But in case if this will not stop process for some time, Neutron will try to kill this process with SIGKILL (-9). That was causing problem with rootwrap as kill filters for this process allowed to send only "-15" to it. Now it is possible to kill this process with "-9" too. Conflicts: etc/neutron/rootwrap.d/l3.filters Change-Id: Id019fa7649bd1158f9d56e63f8dad108d0ca8c1f Closes-bug: #1860326 (cherry picked from commit d6fccd247f70abc84c8a480138e135717836c7b3) --- etc/neutron/rootwrap.d/l3.filters | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/etc/neutron/rootwrap.d/l3.filters b/etc/neutron/rootwrap.d/l3.filters index 317ffbeb83d..02706dab0b5 100644 --- a/etc/neutron/rootwrap.d/l3.filters +++ b/etc/neutron/rootwrap.d/l3.filters @@ -64,17 +64,17 @@ keepalived_state_change: CommandFilter, neutron-keepalived-state-change, root # command of the process to be killed is python. # TODO(mlavalle) These kill filters will be updated once we come up with a # mechanism to kill using the name of the script being executed by Python -kill_keepalived_monitor_py: KillFilter, root, python, -15 -kill_keepalived_monitor_py27: KillFilter, root, python2.7, -15 -kill_keepalived_monitor_py3: KillFilter, root, python3, -15 -kill_keepalived_monitor_py35: KillFilter, root, python3.5, -15 -kill_keepalived_monitor_py36: KillFilter, root, python3.6, -15 -kill_keepalived_monitor_py37: KillFilter, root, python3.7, -15 +kill_keepalived_monitor_py: KillFilter, root, python, -15, -9 +kill_keepalived_monitor_py27: KillFilter, root, python2.7, -15, -9 +kill_keepalived_monitor_py3: KillFilter, root, python3, -15, -9 +kill_keepalived_monitor_py35: KillFilter, root, python3.5, -15, -9 +kill_keepalived_monitor_py36: KillFilter, root, python3.6, -15, -9 +kill_keepalived_monitor_py37: KillFilter, root, python3.7, -15, -9 # For e.g. RHEL8 neutron-keepalived-state-change is run by "system python" # which is /usr/libexec/platform-python3.6 so this should be in filters also. # Path /usr/libexec isn't in PATH by default so it has to be given here as # absolute path -kill_keepalived_monitor_platform_py: KillFilter, root, /usr/libexec/platform-python, -15 -kill_keepalived_monitor_platform_py36: KillFilter, root, /usr/libexec/platform-python3.6, -15 +kill_keepalived_monitor_platform_py: KillFilter, root, /usr/libexec/platform-python, -15, -9 +kill_keepalived_monitor_platform_py36: KillFilter, root, /usr/libexec/platform-python3.6, -15, -9 # neutron-keepalived-state-change-monitor kill script filter kill_neutron-keepalived-state-change-monitor_script: CommandFilter, neutron-keepalived-state-change-monitor-kill, root