Skip to content

Rewrite Python version of supervisor-proc-exit-listener in Rust (supervisor-proc-exit-listener-rs) without integration #24508

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

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
+3,344 −1
Open

Rewrite Python version of supervisor-proc-exit-listener in Rust (supervisor-proc-exit-listener-rs) without integration #24508

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
8ed5801
Move supervisor-proc-exit-listener to a wheel folder, add unit test
qiluo-msft Aug 12, 2025
502c564
Revert src/sonic-supervisord-utilities/scripts/supervisor-proc-exit-l…
qiluo-msft Aug 12, 2025
72a8afa
Remove unused dependencies, move some to dev-dependencies
qiluo-msft Aug 13, 2025
1407c37
Simplify childutils function signature
qiluo-msft Aug 13, 2025
f9b1e7b
Simplify main()
qiluo-msft Aug 14, 2025
fc49c2f
Use monotonic time function
qiluo-msft Aug 14, 2025
dfe18fc
Update injectorpp rev in dev-dependencies
qiluo-msft Aug 16, 2025
d93a8a1
Use log crate instead of tracing
qiluo-msft Aug 17, 2025
3f2e7e7
Implement select on stdin
qiluo-msft Aug 17, 2025
5e6876c
Add unit test for polling
qiluo-msft Aug 18, 2025
23efe21
Rename filename
qiluo-msft Nov 5, 2025
7cb822f
Use severity enum
qiluo-msft Nov 6, 2025
f18f9ac
Remove hardcode Token(0)
qiluo-msft Nov 6, 2025
033eaa3
Revert back supervisord.conf files
qiluo-msft Nov 12, 2025
398f43f
Revert back src/sonic-dhcp-utilities/tests/test_data/supervisor.conf
qiluo-msft Nov 13, 2025
3b276fb
Fix build warnings: unused variables
qiluo-msft Nov 13, 2025
3d1bcb1
Fix build error: cannot find value `LOG_WARNING` in crate `syslog`
qiluo-msft Nov 13, 2025
d89d64a
Fix build error on register function
qiluo-msft Nov 13, 2025
93ff7da
Simplify HashMap usage
qiluo-msft Nov 13, 2025
f778248
Use scopeguard in unit test
qiluo-msft Nov 14, 2025
6788f7f
Remove extra testcase
qiluo-msft Nov 14, 2025
f57f590
Add missing .dep file
qiluo-msft Nov 15, 2025
ab864ad
Refine debian/control Build-Depends
qiluo-msft Nov 15, 2025
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
3 changes: 2 additions & 1 deletion rules/docker-config-engine-bookworm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ $(DOCKER_CONFIG_ENGINE_BOOKWORM)_DEPENDS += $(LIBSWSSCOMMON) \
$(LIBYANG_PY3) \
$(PYTHON3_SWSSCOMMON) \
$(SONIC_DB_CLI) \
$(SONIC_EVENTD)
$(SONIC_EVENTD) \
$(SONIC_SUPERVISORD_UTILITIES_RS)
$(DOCKER_CONFIG_ENGINE_BOOKWORM)_PYTHON_WHEELS += $(SONIC_PY_COMMON_PY3) \
$(SONIC_YANG_MGMT_PY3) \
$(SONIC_YANG_MODELS_PY3) \
Expand Down
14 changes: 14 additions & 0 deletions rules/sonic-supervisord-utilities-rs.mk
View file
Open in desktop
Copy link
Contributor

@saiarcot895 saiarcot895 Nov 14, 2025 •
edited by qiluo-msft
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please create the .dep file for this as well. #Resolved

Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
SONIC_SUPERVISORD_UTILITIES_RS_VERSION = 1.0.0
SONIC_SUPERVISORD_UTILITIES_RS_NAME = sonic-supervisord-utilities-rs

SONIC_SUPERVISORD_UTILITIES_RS = $(SONIC_SUPERVISORD_UTILITIES_RS_NAME)_$(SONIC_SUPERVISORD_UTILITIES_RS_VERSION)_$(CONFIGURED_ARCH).deb
$(SONIC_SUPERVISORD_UTILITIES_RS)_SRC_PATH = $(SRC_PATH)/sonic-supervisord-utilities-rs
$(SONIC_SUPERVISORD_UTILITIES_RS)_VERSION = $(SONIC_SUPERVISORD_UTILITIES_RS_VERSION)
$(SONIC_SUPERVISORD_UTILITIES_RS)_NAME = $(SONIC_SUPERVISORD_UTILITIES_RS_NAME)
$(SONIC_SUPERVISORD_UTILITIES_RS)_DEPENDS = $(LIBSWSSCOMMON_DEV)
$(SONIC_SUPERVISORD_UTILITIES_RS)_RDEPENDS = $(LIBSWSSCOMMON)

SONIC_DPKG_DEBS += $(SONIC_SUPERVISORD_UTILITIES_RS)

SONIC_SUPERVISORD_UTILITIES_RS_DBG = $(SONIC_SUPERVISORD_UTILITIES_RS_NAME)-dbgsym_$(SONIC_SUPERVISORD_UTILITIES_RS_VERSION)_$(CONFIGURED_ARCH).deb
$(eval $(call add_derived_package,$(SONIC_SUPERVISORD_UTILITIES_RS),$(SONIC_SUPERVISORD_UTILITIES_RS_DBG)))
2 changes: 1 addition & 1 deletion src/sonic-dhcp-utilities/tests/test_data/supervisor.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ events=PROCESS_STATE
buffer_size=1024

[eventlistener:supervisor-proc-exit-listener]
command=/usr/local/bin/supervisor-proc-exit-listener --container-name dhcp_relay
command=/usr/bin/supervisor-proc-exit-listener-rs --container-name dhcp_relay
Copy link
Contributor

@saiarcot895 saiarcot895 Nov 13, 2025 •
edited by qiluo-msft
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why/how does test data need to be updated? #Resolved

events=PROCESS_STATE_EXITED,PROCESS_STATE_RUNNING
autostart=true
autorestart=unexpected
Expand Down
Loading
Loading