Skip to content
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

Jump to bottom

Multiprocessing Manager resources (Queue) to be freed up during task stop (CherryPick PR#15212 to 202205) #15662

Merged
merged 1 commit into from
Jun 30, 2023
Merged

Multiprocessing Manager resources (Queue) to be freed up during task stop (CherryPick PR#15212 to 202205) #15662

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
30 changes: 25 additions & 5 deletions src/system-health/health_checker/sysmonitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from . import utils
from sonic_py_common.task_base import ProcessTaskBase
from .config import Config
import signal

SYSLOG_IDENTIFIER = "system#monitor"
REDIS_TIMEOUT_MS = 0
Expand Down Expand Up @@ -117,6 +118,8 @@ def __init__(self):
self.state_db = None
self.config_db = None
self.config = Config()
self.mpmgr = multiprocessing.Manager()
self.myQ = self.mpmgr.Queue()

#Sets system ready status to state db
def post_system_status(self, state):
Expand Down Expand Up @@ -422,13 +425,11 @@ def system_service(self):
self.state_db = swsscommon.SonicV2Connector(use_unix_socket_path=True)
self.state_db.connect(self.state_db.STATE_DB)

mpmgr = multiprocessing.Manager()
myQ = mpmgr.Queue()
try:
monitor_system_bus = MonitorSystemBusTask(myQ)
monitor_system_bus = MonitorSystemBusTask(self.myQ)
monitor_system_bus.task_run()

monitor_statedb_table = MonitorStateDbTask(myQ)
monitor_statedb_table = MonitorStateDbTask(self.myQ)
monitor_statedb_table.task_run()

except Exception as e:
Expand All @@ -442,7 +443,7 @@ def system_service(self):
# Queue to receive the STATEDB and Systemd state change event
while not self.task_stopping_event.is_set():
try:
msg = myQ.get(timeout=QUEUE_TIMEOUT)
msg = self.myQ.get(timeout=QUEUE_TIMEOUT)
event = msg["unit"]
event_src = msg["evt_src"]
event_time = msg["time"]
Expand All @@ -466,5 +467,24 @@ def task_worker(self):
return
self.system_service()

def task_stop(self):
# Signal the process to stop
self.task_stopping_event.set()
#Clear the resources of mpmgr- Queue
self.mpmgr.shutdown()

# Wait for the process to exit
self._task_process.join(self._stop_timeout_secs)

# If the process didn't exit, attempt to kill it
if self._task_process.is_alive():
logger.log_notice("Attempting to kill sysmon main process with pid {}".format(self._task_process.pid))
os.kill(self._task_process.pid, signal.SIGKILL)

if self._task_process.is_alive():
logger.log_error("Sysmon main process with pid {} could not be killed".format(self._task_process.pid))
return False

return True


Loading