-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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.
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
[docker-syncd-cavm]: Properly manage syncd with supervisord #586
Conversation
@NStetskovych: Can you please review and test this PR? Thanks. |
@jleveque tested -all main services started. |
@NStetskovych: I agree that you should use the sai.profile from the device directory. Doing so should also remove the need for you to use a custom syncd init script. You should instead be able to directly use the init script at https://github.com/Azure/sonic-sairedis/blob/master/debian/syncd.init, as other vendors currently are. This will also allow me to create a more universal solution for creating these supervisord start scripts for syncd. I should be able to reuse code between the systemd init script and the supervisord start script. |
@jleveque https://github.com/Azure/sonic-sairedis/blob/master/debian/syncd.init already has support for cavium. I need only remove profile.ini from docker file. But now it looks like I should duplicate syncd.init(syncd.sh ). |
@NStetskovych: I am working on a new PR to replace this one which will use syncd.init for all vendors, including Cavium. I will create it so that it uses the old sai profile location. That way you can test that it works with the current configuration, then after it gets merged, you can submit a PR to use the proper sai.profile. |
Closing in favor of PR #617. |
- cleanup testbed during init failure - turn off nic tx offloading - add runcmd_async - add copy_file - enable ipv6 Signed-off-by: Guohan Lu <gulv@microsoft.com>
* 2189c2f 2020-04-02 | [syncd] Pass correct switch RID when staring diag shell (sonic-net#587) (origin/master, origin/HEAD) [Kamil Cudnik] * 91792db 2020-04-01 | [syncd] Fix crash during stats polling (sonic-net#586) [Vitaliy Senchyshyn] * d13521e 2020-04-01 | [meta] Flush fdb entries after flush api success (sonic-net#581) [Kamil Cudnik] Signed-off-by: Guohan Lu <lguohan@gmail.com>
* f4d9398 2020-04-07 | [vs] Set mto only on tap device (#592) [Kamil Cudnik] * 0ad13f5 2020-04-07 | [lgtm]: add lgtm static analysis configuration (#589) [lguohan] * c961260 2020-04-07 | add swss-common-{inc,lib} to specify the prefix of swss-common library (#590) [lguohan] * 2d68abc 2020-04-06 | [syncd] Load correct global context id (#588) [Kamil Cudnik] * cd82389 2020-04-06 | Return correct error code when port is in use (#565) [Vasant Patil] * 2189c2f 2020-04-02 | [syncd] Pass correct switch RID when staring diag shell (#587) [Kamil Cudnik] * 91792db 2020-04-01 | [syncd] Fix crash during stats polling (#586) [Vitaliy Senchyshyn] * d13521e 2020-04-01 | [meta] Flush fdb entries after flush api success (#581) [Kamil Cudnik] * 54b2510 2020-03-17 | [syncd] Use correct VID when GET will fail to obrain object type (#577) [Kamil Cudnik] * 59b0430 2020-03-16 | [syncd] Unlock vendor api lock if enabling diag shell (#571) [Kamil Cudnik] * 910d45e 2020-03-16 | [vs] Add more logs when setting MTU on port (#576) [Kamil Cudnik] * c0d9947 2020-03-13 | [vs] Fix setting correct port mtu value (#573) [Kamil Cudnik]
[ConfigDBPipeConnector]: Added set_entry API (#586)
…10406) #### Why I did it To take the following into sonic-buildimage 36e1f61 API endpoints to ConfigDBConnector to support pre-loading data without blackout (#587) [sonic-swss-common](https://github.com/Azure/sonic-swss-common) ``` 36e1f61 API endpoints to ConfigDBConnector to support pre-loading data without blackout (#587) 556f4ad Add SAI copy action to ACL schema (#591) db18c3a Fix bitwidth of mac address in SAI ACL schema (#590) e9442bb [ConfigDBPipeConnector]: Added set_entry API (#586) 6c007c0 Update README for gmock (#562) ``` [sonic-linkmgrd](https://github.com/Azure/sonic-linkmgrd) ``` 83dfc99 Enforce uniform file/class naming convention (#52) 83004bf Shutdown ICMP heartbeats when default route state is missing and ToR is in `auto` mode (#44) b81ea31 Add `LinkProberStateMachineActiveActive` (#47) c43cf7a Decrease link probing interval after switchover to better determine the overhead of a toggle (#43) 2239fbe Enhance clang format (#46) ``` #### How I did it * Advanced submodules pointers #### How to verify it 1. make configure PLATFORM=mellanox 2. make target/sonic-mellanox.bin
<!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md failure_prs.log skip_prs.log Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it Microsoft requested that we update port_config.ini - we use hwsku.json so didnt see this locally - but some tools are being used that require port_config.ini ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Changed the lanes to match platform.json #### How to verify it Generate a config_db.json using the port_config.ini <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [x] 202411 #### Tested branch (Please provide the tested image version) 202411 <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> Update 7060X64PEO128S2 hwsku port_config.ini <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
This allows supervisord to log syncd exit events to syslog.