Skip to content

[orchagent] Fix getopt string for -R option (ring_thread_enabled regression) #4207

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
prsunny merged 5 commits into from
Feb 23, 2026
Merged

[orchagent] Fix getopt string for -R option (ring_thread_enabled regression) #4207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c75a85e
[orchagent] Fix getopt string for -R option
Chiranjeevi-U-ML Feb 10, 2026
e40d424
Merge branch 'master' into fix-ring-mode-getopt
dgsudharsan Feb 11, 2026
0698f65
Merge branch 'master' into fix-ring-mode-getopt
dgsudharsan Feb 11, 2026
bbfb7ea
[test] Add UT for orchagent -R flag
Chiranjeevi-U-ML Feb 11, 2026
2e46ea7
Merge branch 'master' into fix-ring-mode-getopt
dgsudharsan Feb 11, 2026
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 orchagent/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ int main(int argc, char **argv)
// Disable SAI MACSec POST by default. Use option -M to enable it.
bool macsec_post_enabled = false;

while ((opt = getopt(argc, argv, "b:m:r:f:j:d:i:hsz:k:q:c:t:v:I:R:D:M")) != -1)
while ((opt = getopt(argc, argv, "b:m:r:f:j:d:i:hsz:k:q:c:t:v:I:RD:M")) != -1)
{
switch (opt)
{
Expand Down
17 changes: 17 additions & 0 deletions tests/test_zmq.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,20 @@ def test_usage(self, dvs):
dvs.runcmd("cp /usr/bin/orchagent.sh_usage_ut_backup /usr/bin/orchagent.sh")
dvs.stop_swss()
dvs.start_swss()

def test_ring_thread(self, dvs):
# Improve test code coverage, change orchagent to enable ring thread
dvs.runcmd("cp /usr/bin/orchagent.sh /usr/bin/orchagent.sh_ring_ut_backup")
dvs.runcmd("sed -i.bak 's/\/usr\/bin\/orchagent /\/usr\/bin\/orchagent -R /g' /usr/bin/orchagent.sh")
dvs.stop_swss()
dvs.start_swss()

# wait orchagent start
time.sleep(3)
process_statue = dvs.runcmd("ps -ef")
zmq_logger.debug("Process status: {}".format(process_statue))

# revert change
dvs.runcmd("cp /usr/bin/orchagent.sh_ring_ut_backup /usr/bin/orchagent.sh")
dvs.stop_swss()
dvs.start_swss()
Loading