Skip to content

Add hamgrd to dash-ha container #23254

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 2 commits into
base: master
Choose a base branch
from
Open

Add hamgrd to dash-ha container #23254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3615f4f
Add hamgrd to dash-ha container
yue-fred-gao Jul 8, 2025
f4316fd
Merge branch 'master' into add_hamgrd_to_dash_ha
yue-fred-gao Jul 8, 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
2 changes: 1 addition & 1 deletion dockers/docker-dash-ha/critical_processes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
program:swbusd
program:hamgrd

Copy link
Contributor

Choose a reason for hiding this comment

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

@yue-fred-gao Do we have check for this process to be started only for smartswitch SKUs? Please check and confirm

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@kperumalbfn no, we don't. The process is part of dash-ha container, which is controlled by controller via FEATURE table. We don't want to limit it to smartswitch. Actually, the initial implementation enabled dash-ha feature automatically for smartswitch but we decided against it.

24 changes: 12 additions & 12 deletions dockers/docker-dash-ha/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@ dependent_startup=true
command=/bin/bash -c 'SLOT=${DEV: -1}; exec /usr/bin/swbusd -s "$SLOT"'
priority=2
autostart=false
autorestart=false
autorestart=true
stdout_logfile=NONE
stdout_syslog=true
stderr_logfile=NONE
stderr_syslog=true
dependent_startup=true
dependent_startup_wait_for=rsyslogd:running

;[program:hamgrd]
;command=/usr/bin/hamgrd
;priority=4
;autostart=false
;autorestart=false
;stdout_logfile=NONE
;stdout_syslog=true
;stderr_logfile=NONE
;stderr_syslog=true
;dependent_startup=true
;dependent_startup_wait_for=swbusd:running
[program:hamgrd]
command=/bin/bash -c 'SLOT=${DEV: -1}; exec /usr/bin/hamgrd -s "$SLOT"'
priority=3
autostart=false
autorestart=false
stdout_logfile=NONE
stdout_syslog=true
stderr_logfile=NONE
stderr_syslog=true
dependent_startup=true
dependent_startup_wait_for=swbusd:running
2 changes: 1 addition & 1 deletion src/sonic-dash-ha
Open in desktop
Submodule sonic-dash-ha updated 19 files
+1 −0 Cargo.lock
+1 −0 Cargo.toml
+1 −0 crates/hamgrd/Cargo.toml
+15 −10 crates/hamgrd/src/actors.rs
+13 −16 crates/hamgrd/src/actors/dpu.rs
+797 −1 crates/hamgrd/src/actors/ha_scope.rs
+520 −11 crates/hamgrd/src/actors/ha_set.rs
+238 −54 crates/hamgrd/src/actors/test.rs
+202 −1 crates/hamgrd/src/actors/vdpu.rs
+246 −2 crates/hamgrd/src/db_structs.rs
+41 −23 crates/hamgrd/src/ha_actor_messages.rs
+25 −12 crates/hamgrd/src/main.rs
+6 −1 crates/swbus-actor/src/driver.rs
+8 −0 crates/swbus-actor/src/state/internal.rs
+1 −1 crates/swbus-actor/src/state/outgoing.rs
+15 −0 crates/swss-common-testing/src/lib.rs
+1 −1 test_utils/hamgrd/database_config.json
+4 −4 test_utils/hamgrd/redis_data_planned_up_then_down.cmd
+0 −3 test_utils/hamgrd/redis_data_set_full.cmd
Loading