openstack/neutron
Code Issues Proposed changes

Merge "Clean up state VRRP PID file"

Browse Source
This commit is contained in:
Zuul 2024-03-25 16:12:28 +00:00 committed by Gerrit Code Review
commit e003fd73f6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/agent/linux/keepalived.py
View File

@ -27,6 +27,7 @@ from oslo_utils import fileutils
from neutron._i18n import _ from neutron._i18n import _
from neutron.agent.linux import external_process from neutron.agent.linux import external_process
from neutron.agent.linux import utils as linux_utils
from neutron.cmd import runtime_checks as checks from neutron.cmd import runtime_checks as checks
from neutron.common import utils from neutron.common import utils
@ -504,8 +505,12 @@ class KeepalivedManager(object):
# will be orphan and prevent keepalived process to be spawned. # will be orphan and prevent keepalived process to be spawned.
# A check here will let the l3-agent to kill the orphan process # A check here will let the l3-agent to kill the orphan process
# and spawn keepalived successfully. # and spawn keepalived successfully.
# Also removes stale pid file
if vrrp_pm.active: if vrrp_pm.active:
vrrp_pm.disable() vrrp_pm.disable(delete_pid_file=False)
linux_utils.delete_if_exists(self.get_vrrp_pid_file_name(pid_file),
run_as_root=vrrp_pm.run_as_root)
cmd = ['keepalived', '-P', cmd = ['keepalived', '-P',
'-f', config_path, '-f', config_path,