Skip to content
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

Closed
wants to merge 1 commit into from
Closed

[docker-syncd-cavm]: Properly manage syncd with supervisord #586

wants to merge 1 commit into from

Conversation

jleveque
Copy link
Contributor

This allows supervisord to log syncd exit events to syslog.

@jleveque
Copy link
Contributor Author

@NStetskovych: Can you please review and test this PR? Thanks.

@NStetskovych-zz
Copy link
Contributor

@jleveque tested -all main services started.
admin@sonic:~$ ps -ax | grep "orchagent -m|portsyncd|intfsyncd|neighsyncd|syncd -p|/usr/bin/redis-server"
1424 pts/0 Sl 0:02 /usr/bin/redis-server 127.0.0.1:6379
6325 pts/8 Sl 0:08 syncd -p /etc/ssw/AS7512/profile.ini -N
6390 pts/7 Sl 0:00 orchagent -m cc:37:ab:d4:48:40
6391 pts/7 Sl 0:00 portsyncd -p /usr/share/sonic/hwsku/port_config.ini
6392 pts/7 Sl 0:00 intfsyncd
6393 pts/7 Sl 0:00 neighsyncd
8182 pts/9 S+ 0:00 grep orchagent -m|portsyncd|intfsyncd|neighsyncd|syncd -p|/usr/bin/redis-server
The only thing here that I plan to use sai.profile from device directory. Now it looks a little bit duplicated to put syncd init script in each docker.

@jleveque
Copy link
Contributor Author

@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.

@NStetskovych-zz
Copy link
Contributor

@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 ).
Please, let me know your father action regarding universal solution. I will add commit to this branch that remove profile.ini from syncd docker.

@jleveque
Copy link
Contributor Author

@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.

@jleveque
Copy link
Contributor Author

Closing in favor of PR #617.

@jleveque jleveque closed this May 20, 2017
@jleveque jleveque deleted the supervise_syncd_cavm branch May 20, 2017 01:37
madhanmellanox pushed a commit to madhanmellanox/sonic-buildimage that referenced this pull request Mar 23, 2020
- cleanup testbed during init failure
- turn off nic tx offloading
- add runcmd_async
- add copy_file
- enable ipv6

Signed-off-by: Guohan Lu <[email protected]>
lguohan added a commit to judyjoseph/sonic-buildimage that referenced this pull request Apr 2, 2020
* 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 <[email protected]>
lguohan pushed a commit that referenced this pull request Apr 8, 2020
* 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]
dmytroxshevchuk pushed a commit to dmytroxshevchuk/sonic-buildimage that referenced this pull request Aug 31, 2020
judyjoseph added a commit that referenced this pull request Mar 20, 2022
[ConfigDBPipeConnector]: Added set_entry API (#586)
qiluo-msft pushed a commit that referenced this pull request Apr 2, 2022
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants