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.

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

Jump to bottom

[docker-platform-monitor] make file and supervisord conf change for new xcvrd deamon #1840

Merged
merged 3 commits into from
Aug 3, 2018
Merged

[docker-platform-monitor] make file and supervisord conf change for new xcvrd deamon #1840

merged 3 commits into from
Aug 3, 2018

Conversation

keboliu
Copy link
Collaborator

@keboliu keboliu commented Jul 3, 2018

- What I did
make file and supervisord conf change for new xcvrd deamon

- How I did it
* make file change for the new daemon
* supervisord conf change for the new daemon start up

- How to verify it
run image on mlnx platform

- Description for the changelog
modified: dockers/docker-platform-monitor/start.sh
modified: dockers/docker-platform-monitor/supervisord.conf
modified: rules/docker-platform-monitor.mk
new file: rules/sonic-xcvrd.mk

- A picture of a cute animal (not mandatory but encouraged)

@keboliu
[docker-platform-monitor] make file and supervisord conf change for n…
054b2e4 
…ew xcvrd deamon

* make file change for the new daemon
* supervisord conf change for the new daemon

signed-off-by Liu Kebo kebol@mellanox.com
jleveque
jleveque suggested changes Jul 3, 2018
View reviewed changes
dockers/docker-platform-monitor/supervisord.conf

[program:xcvrd]
command=/usr/bin/xcvrd
priority=6
Copy link
Contributor

Choose a reason for hiding this comment

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

I try to align the priority with the order in which we'd like the applications to start. Because supervisor doesn't handle sequential starting properly, we start our programs in the start.sh script. There, you have xcvrd starting after rsyslogd. Please adjust one of the files so that they are in agreement.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

move xcvrd to be started after ledd in start.sh

@keboliu
Copy link
Collaborator Author

keboliu commented Jul 4, 2018

This PR need to be updated to pick up the daemon source code after #sonic-net/sonic-platform-daemons#17 been merged.

jleveque
jleveque reviewed Jul 12, 2018
View reviewed changes
Copy link
Contributor

@jleveque jleveque left a comment

Choose a reason for hiding this comment

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

Build is failing due to outstanding PR in sonic-platform-daemons. Once that PR merges, please update the submodule in this PR.

@lguohan
Copy link
Collaborator

lguohan commented Jul 30, 2018

retest this please

@keboliu
Copy link
Collaborator Author

keboliu commented Jul 31, 2018

@lguohan to have this PR check pass need to update the submodule in this PR so the xcvrd code will be included. This shall be done after all other PRs merged. now we have #1839 left

@lguohan
Copy link
Collaborator

lguohan commented Aug 1, 2018

@keboliu, what is the status of #1839, are you still working on it?

@keboliu
Copy link
Collaborator Author

keboliu commented Aug 2, 2018

@lguohan the coding part for #1839 is already done, we will have a followed enhancement design to make this xcvrd more robust, mainly to handle the scenario that mlnx-sfpd(which expose SFP change event from mlnx SDK) failed. Qi's view is that to have above enhancement reviewed then merge this PR. What's your view?

@lguohan
Copy link
Collaborator

lguohan commented Aug 2, 2018

@qiluo-msft , let me merge this first and test and kebo will iterate on that.

@qiluo-msft
Copy link
Collaborator

@lguohan Please go ahead without me. I didn't block this PR.

@keboliu
Copy link
Collaborator Author

keboliu commented Aug 3, 2018

retest this please.

@keboliu
Copy link
Collaborator Author

keboliu commented Aug 3, 2018

@lguohan submodule sonic-platform-daemon was updated.

@lguohan lguohan merged commit 38beca6 into sonic-net:master Aug 3, 2018
@keboliu keboliu deleted the mlnx-sfp-mkfile branch August 22, 2018 10:30
lguohan pushed a commit that referenced this pull request Sep 6, 2018
@keboliu @lguohan
[docker-platform-monitor] make file and supervisord conf change for n…
e237df8 
…ew xcvrd deamon (#1840)

* [docker-platform-monitor] make file and supervisord conf change for new xcvrd deamon

* make file change for the new daemon
* supervisord conf change for the new daemon

signed-off-by Liu Kebo kebol@mellanox.com

* make xcvrd start sequence aligned with the supervisord conf

* update submodules to include xcvrd modification
qiluo-msft added a commit that referenced this pull request Dec 20, 2021
@qiluo-msft
[sonic-utilities] submodule update (#9315)
0d327ab 
#### Why I did it
Including below commits:
```
fe00bbf 2021-12-17 | Revert "[sonic-package-manager] support sonic-cli-gen and packages with YANG model (#1650)" (#1972) [Prince George]
5fe6d92 2021-12-16 | [warm/fast-reboot] Fix kexec portion to support platforms based on Device Tree (#1966) [dflynn-Nokia]
74d2a09 2021-12-17 | [portstat] check TX/RX utilization calculation correctness (#1840) [Andriy Yurkiv]
e44c3f6 2021-12-16 | [generic-config-updater] Improving CreateOnly validator and marking /LOOPBACK_INTERFACE/LOOPBACK#/vrf_name as create-only (#1969) [Mohamed Ghoneim]
0067cc4 2021-12-15 | [build] adapt for upstream target path change (#1971) [Qi Luo]
96143ee 2021-12-09 | preserve old order for config reload (#1964) [arlakshm]
f08c81d 2021-12-10 | [vxlan] remove unnecessary whitespace for show commands (#1792) [Gord Chen]
14889ce 2021-12-09 | [soft-reboot] Add support for platforms based on Device Tree (#1963) [dflynn-Nokia]
7ceccd7 2021-12-08 | [generic-config-updater] Adding non-strict mode (#1929) [Mohamed Ghoneim]
2e462ef 2021-12-07 | [sfputil] Firmware download/upgrade CLI support for QSFP-DD (#1947) [Prince George]
7c34b79 2021-12-07 | [config] Add portchannel support  for static route  (#1857) [Dmytro]
54cc370 2021-12-06 | [doc] Refine doc on show loopback/mgmt ports (#1958) [Qi Luo]
3714f63 2021-12-06 | [port2alias]: Fix to get right number of return values (#1906) [SuvarnaMeenakshi]
3fa0854 2021-12-06 | [CLI][show bgp] On chassis don't show internal BGP sessions by default (#1927) [Mahesh Maddikayala]
6de91af 2021-12-06 | [Auto-Techsupport] Issues related to Multiple Cores crashing handled (#1948) [Vivek Reddy]
656ade1 2021-12-06 | SFP-Refactor: Vendor revision is not displayed properly (#1950) [Aravind Mani]
67466cb 2021-12-05 | [port] Fix port speed set (#1952) [Mykola Gerasymenko]
5172972 2021-12-04 | Fix invalid output of syslog IPv6 servers (#1933) [jingwenxie]
290ff5f 2021-12-03 | Routed subinterface enhancements (#1821) [Preetham]
1ea88e2 2021-12-01 | Enhance sfputil for CMIS QSFP (#1949) [andywongarista]
4e132c1 2021-11-30 | [debug dump] Refactoring Modules and Unit Tests (#1943) [Vivek Reddy]
b550c44 2021-11-30 | Add command reference for trap flow counters (#1876) [Junchao-Mellanox]
67a267b 2021-11-30 | [Reclaim buffer] [Mellanox] Db migrator support reclaiming reserved buffer for unused ports (#1822) [Stephen Sun]
30e4654 2021-11-25 | Add show command for BFD sessions (#1942) [Shi Su]
e63f47e 2021-11-25 | [warm-reboot] Fix failures of warm reboot on disconnect of ssh session (#1529) [maksymbelei95]
c05845d 2021-11-25 | Add trap flow counter support (#1868) [Junchao-Mellanox]
ef82f00 2021-11-24 | [load_minigraph] Delay pfcwd start until the buffer templates are rendered (#1937) [Neetha John]
f5e5a56 2021-11-24 | [sonic-package-manager] support sonic-cli-gen and packages with YANG model (#1650) [Stepan Blyshchak]
64777a4 2021-11-23 | generic_config_updater: Filename changed & VLAN validator added (#1919) [Renuka Manavalan]
1f8f6ab 2021-11-23 | [config reload] Update command reference (#1941) [Sudharsan Dhamal Gopalarathnam]
```
judyjoseph added a commit that referenced this pull request Dec 22, 2021
@judyjoseph
Update sonic-utilities submodule
1aa225c 
74d2a09 [portstat] check TX/RX utilization calculation correctness (#1840)
taras-keryk pushed a commit to taras-keryk/sonic-buildimage that referenced this pull request Apr 28, 2022
@ayurkiv-nvda
[portstat] check TX/RX utilization calculation correctness (sonic-net…
74d2a09 
…#1840)

#### What I did
Update test for checking TX/RX utilization

#### How I did it
Add real values for TX/RX to mock table instead of zeroes 

#### How to verify it
run **portstat_test.py** via  `python3 setup.py test`  in  sonic-utilities tests
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jleveque jleveque jleveque approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@keboliu @lguohan @qiluo-msft @jleveque