[Orchagent] Enable ZMQ on orchagent route table.#23028
[Orchagent] Enable ZMQ on orchagent route table.#23028qiluo-msft merged 10 commits intosonic-net:masterfrom
Conversation
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure.sonic-buildimage |
liuh-80
changed the title
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
@prabhataravind , would you review and check if its needed for 202506 internal? |
| mgmt_ip=$( ip -json -4 addr show eth0 | jq -r ".[0].addr_info[0].local" ) | ||
| if [[ $midplane_mgmt_state == "UP" ]]; then | ||
| # Enable ZMQ with eth0-midplane interface name | ||
| ORCHAGENT_ARGS+=" -q tcp://eth0-midplane:8100" |
There was a problem hiding this comment.
I don't understand why ORCH_ZMQ_PORT is being removed. Could you clarify please?
There was a problem hiding this comment.
The change in sonic-net/sonic-swss#3619 modifies how orchagent handles ZMQ addresses for support multiple namespaces:
If the address includes a port, then create ZMQ client with the address.
If not, the ZMQ client will be created using the default ZMQ port along with the namespace ID. For the default namespace, the port will still be set to 8100.
I couldn’t find the code for the 202506 branch. However, if PR #3619 and PR #3632 are not included in that branch, this change should not be cherry-picked into 202506.
There was a problem hiding this comment.
Okay, that makes sense. The 202506 branch is here: https://github.com/Azure/sonic-buildimage-msft/tree/202506. We will have the labels for this branch soon.
There was a problem hiding this comment.
According to the code of 202506branch, this PR should cherry-pick to it.
|
/azp run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
| @@ -1,4 +1,4 @@ | |||
| {% if DEVICE_METADATA.localhost.orch_dash_zmq_enabled == "false" %} | |||
| {% if DEVICE_METADATA.localhost.orch_northbond_dash_zmq_enabled != "false" %} | |||
There was a problem hiding this comment.
shouldn't this be checked against "true"? If the config is disabled, we don't want all these tables in orch_zmq_tables.conf.
Please check all 4 combinations of dash_zmq_disabled/route_zmq_disabled, dash_zmq_enabled/route_zmq_disabled, dash_zmq_disabled/route_zmq_enabled, dash_zmq_enabled/route_zmq_enabled to make sure orch_zmq_tables.conf looks correct in all cases.
There was a problem hiding this comment.
Verified all combinations with deploy mini graph, this file can be rendered correctly.
There was a problem hiding this comment.
Thanks. This looks good to me.
There was a problem hiding this comment.
btw @liuh-80 it looks like there are some new tables that are not in this list. @zjswhhh and @theasianpianist could you pls double check if all recent tables added by you are here? It looks like some are missing to me.
There was a problem hiding this comment.
@zjswhhh , @theasianpianist , if your new tables want to have swssconfig and swsssplayer command support when ZMQ enabled, please also update those tables to orch_zmq_tables.conf.j2
|
PR validation failed, seems relate with this change: Waiting for fix PR merge: |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azpw run Azure.sonic-buildimage |
|
/AzurePipelines run Azure.sonic-buildimage |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Fix PR merged, trigger buildimage again |
6 participants
Enable ZMQ on orchagent route table.
Why I did it
To enhance route performance, sonic-swss introduces a new feature enabling ZMQ communication between fpmsyncd and orchagent. With this change, the orchagent.sh script must be updated to always pass the ZMQ address parameter.
Additionally, the feature flag changed during code review of sonic-net/sonic-swss#3619, so yang model and config also need update in this PR.
Work item tracking
How I did it
Update orchagent.sh and yang module.
How to verify it
Pass all test case
Manually verified with latest image.
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Enable ZMQ on orchagent route table.
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)