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

[mellanox]: Fixed config reload race #2930

Merged
merged 1 commit into from
May 29, 2019

Conversation

nazariig
Copy link
Collaborator

Signed-off-by: Nazarii Hnydyn nazariig@mellanox.com

This PR propagates fix for config reload race:

root@sonic:/etc/sonic# config load_minigraph -y
Running command: systemctl stop dhcp_relay
Running command: systemctl stop swss
Running command: systemctl stop snmp
Warning: Stopping snmp.service, but it can still be activated by:
snmp.timer
Running command: systemctl stop lldp
Running command: systemctl stop pmon
Running command: systemctl stop bgp
Running command: systemctl stop teamd
Running command: systemctl stop hostcfgd
Running command: /usr/local/bin/sonic-cfggen -H -m -j /etc/sonic/init_cfg.json --write-to-db
Running command: pfcwd start_default
Running command: config qos reload
Running command: /usr/local/bin/sonic-cfggen -d -t /usr/share/sonic/device/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers.json.j2 >/tmp/buffers.json
Running command: /usr/local/bin/sonic-cfggen -d -t /usr/share/sonic/device/x86_64-mlnx_msn2700-r0/ACS-MSN2700/qos.json.j2 -y /etc/sonic/sonic_version.yml >/tmp/qos.json
Running command: /usr/local/bin/sonic-cfggen -j /tmp/buffers.json --write-to-db
Running command: /usr/local/bin/sonic-cfggen -j /tmp/qos.json --write-to-db

Running command: systemctl restart hostname-config
Running command: systemctl restart interfaces-config
Running command: systemctl restart ntp-config
Running command: systemctl restart rsyslog-config
Running command: systemctl restart swss
Running command: systemctl restart bgp
Running command: systemctl restart teamd
Running command: systemctl restart pmon
Job for pmon.service canceled.

The issue was introduced by these PRs:

  1. https://github.com/Azure/sonic-buildimage/pull/2639/files
  2. https://github.com/Azure/sonic-buildimage/pull/2634/files

- What I did

  • Fixed pmon restart race
  • Removed redundant chipupen logic

- How I did it

  • Added check to do pmon restart only if service is active

- How to verify it

  1. config reload -y
  2. systemctl restart swss

- Description for the changelog

  • N/A

Signed-off-by: Nazarii Hnydyn <nazariig@mellanox.com>
@nazariig
Copy link
Collaborator Author

@lguohan @jleveque please review

@lguohan
Copy link
Collaborator

lguohan commented May 28, 2019

is this needed for 201811 branch?

@nazariig
Copy link
Collaborator Author

@lguohan no, we do not need this in 201811 branch.

@liat-grozovik liat-grozovik merged commit e041b15 into sonic-net:master May 29, 2019
mssonicbld added a commit that referenced this pull request Jan 10, 2024
…lly (#17725)

#### Why I did it
src/sonic-swss
```
* 7702b8a2 - (HEAD -> master, origin/master, origin/HEAD) Add host_tx_ready enhancements (#2930) (10 hours ago) [noaOrMlnx]
```
#### How I did it
#### How to verify it
#### Description for the changelog
yxieca pushed a commit that referenced this pull request Jan 24, 2024
…lly (#17880)

src/sonic-swss

* b78a4181 - (HEAD -> 202311, origin/202311) Add host_tx_ready enhancements (#2930) (2 days ago) [noaOrMlnx]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants