Skip to content

[action] [PR:19673] [dhcp_server] Remove invoke of dhcpmon when dhcp_server is enabled (#19673) #19684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mssonicbld merged 1 commit into from
Jul 25, 2024
Merged

[action] [PR:19673] [dhcp_server] Remove invoke of dhcpmon when dhcp_server is enabled (#19673) #19684

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/sonic-dhcp-utilities/dhcp_utilities/dhcprelayd/dhcprelayd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ def refresh_dhcrelay(self, force_kill=False):
dhcp_interfaces.discard(dhcp_interface)
continue
self._start_dhcrelay_process(dhcp_interfaces, dhcp_server_ip, force_kill)
self._start_dhcpmon_process(dhcp_interfaces, force_kill)

# TODO dhcpmon is not ready for count packet for dhcp_server, hence comment invoke it for now
# self._start_dhcpmon_process(dhcp_interfaces, force_kill)

def wait(self):
"""
Expand Down Expand Up @@ -246,7 +248,7 @@ def _start_dhcpmon_process(self, new_dhcp_interfaces, force_kill):
for pid, cmds in pids_cmds.items():
proc = psutil.Process(pid)
if proc.status() == psutil.STATUS_ZOMBIE:
syslog.syslog(syslog.LOG_ERR, "Faild to start dhcpmon process: {}".format(cmds))
syslog.syslog(syslog.LOG_ERR, "Failed to start dhcpmon process: {}".format(cmds))
terminate_proc(proc)
else:
syslog.syslog(syslog.LOG_INFO, "dhcpmon process started successfully, cmds: {}".format(cmds))
Expand Down