Skip to content

[reload] Improve reload by using sonic.target.#1199

Merged
liat-grozovik merged 11 commits intosonic-net:masterfrom
stepanblyschak:reload_enhancement
Mar 1, 2021
Merged

[reload] Improve reload by using sonic.target.#1199
liat-grozovik merged 11 commits intosonic-net:masterfrom
stepanblyschak:reload_enhancement

Conversation

@stepanblyschak
Copy link
Contributor

@stepanblyschak stepanblyschak commented Oct 28, 2020

Signed-off-by: Stepan Blyshchak stepanb@nvidia.com

- What I did

To remove the list of hardcoded order-dependent lists of services to stop/restart/reset-failed.

- How I did it

Used sonic.target to stop/restart/reset-failed.

- How to verify it

Execute config reload and observe the services do restart.

- Previous command output (if the output of a command-line utility has changed)

admin@r-tigon-11:~$ sudo config reload -y
Executing stop of service telemetry...
Executing stop of service swss...
Executing stop of service lldp...
Executing stop of service bgp...
Executing stop of service hostcfgd...
Running command: /usr/local/bin/sonic-cfggen -j /etc/sonic/init_cfg.json -j /etc/sonic/config_db.json --write-to-db
Running command: /usr/local/bin/db_migrator.py -o migrate
Executing reset-failed of service bgp...
Executing reset-failed of service dhcp_relay...
Executing reset-failed of service hostcfgd...
Executing reset-failed of service hostname-config...
Executing reset-failed of service interfaces-config...
Executing reset-failed of service lldp...
Executing reset-failed of service ntp-config...
Executing reset-failed of service pmon...
Executing reset-failed of service radv...
Executing reset-failed of service rsyslog-config...
Executing reset-failed of service snmp...
Executing reset-failed of service swss...
Executing reset-failed of service syncd...
Executing reset-failed of service teamd...
Executing reset-failed of service telemetry...
Executing restart of service hostname-config...
Executing restart of service interfaces-config...
Executing restart of service ntp-config...
Executing restart of service rsyslog-config...
Executing restart of service swss...
Executing restart of service bgp...
Executing restart of service lldp...
Executing restart of service hostcfgd...
Executing restart of service telemetry...
Reloading Monit configuration ...
Reinitializing monit daemon

- New command output (if the output of a command-line utility has changed)

admin@r-tigon-11:~$ sudo config reload -y
Stopping SONiC target ...
Running command: /usr/local/bin/sonic-cfggen -j /etc/sonic/init_cfg.json -j /etc/sonic/config_db.json --write-to-db
Running command: /usr/local/bin/db_migrator.py -o migrate
Resetting failed status on bgp.service
Resetting failed status on dhcp_relay.service
Resetting failed status on hostcfgd.service
Resetting failed status on hostname-config.service
Resetting failed status on interfaces-config.service
Resetting failed status on lldp.service
Resetting failed status on mgmt-framework.timer
Resetting failed status on nat.service
Resetting failed status on ntp-config.service
Resetting failed status on pmon.service
Resetting failed status on radv.service
Resetting failed status on rsyslog-config.service
Resetting failed status on sflow.service
Resetting failed status on swss.service
Resetting failed status on syncd.service
Resetting failed status on teamd.service
Resetting failed status on telemetry.timer
Restarting SONiC target ...
Reloading Monit configuration ...
Reinitializing monit daemon

@stepanblyschak
[reload] Improve reload by using sonic.target.
74c1595 
Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
@stepanblyschak
[config] fix config load_minigraph test and remove telemetry case.
6b63721 
Telemetry test case is no longer valid scenario to unit test.

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
This was referenced Oct 28, 2020
Closed
Merged
@lgtm-com
Copy link

lgtm-com bot commented Oct 28, 2020

This pull request introduces 1 alert when merging 6b63721 into 1753f22 - view on LGTM.com

new alerts:

  • 1 for Unused import

@stepanblyschak
[config] remove unused import
8609d8b 
Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
@keboliu
Copy link
Collaborator

keboliu commented Nov 4, 2020

retest this please

yxieca
yxieca previously approved these changes Nov 10, 2020
View reviewed changes
@yxieca yxieca requested a review from jleveque November 10, 2020 17:29
@jleveque
Copy link
Contributor

jleveque commented Nov 10, 2020

This PR depends on sonic-net/sonic-buildimage#5705

@stepanblyschak
Merge branch 'master' of github.com:azure/sonic-utilities into reload…
12c8aa5 
…_enhancement

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
@stepanblyschak
Merge branch 'master' of github.com:azure/sonic-utilities into reload…
d2ecb17 
…_enhancement

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
@stepanblyschak stepanblyschak mentioned this pull request Jan 8, 2021
Open
@stepanblyschak
Merge branch 'master' of github.com:azure/sonic-utilities into reload…
557bba3 
…_enhancement

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
@stepanblyschak
Copy link
Contributor Author

stepanblyschak commented Jan 20, 2021

@rajendra-dendukuri I've just merged master and resolved conflict, could you please approve?

@stepanblyschak
Copy link
Contributor Author

stepanblyschak commented Jan 22, 2021

@yxieca Could you please review after merges from master?

yxieca
yxieca previously approved these changes Jan 24, 2021
View reviewed changes
@liat-grozovik
Copy link
Collaborator

liat-grozovik commented Jan 26, 2021

retest this please

1 similar comment
@liat-grozovik
Copy link
Collaborator

liat-grozovik commented Jan 27, 2021

retest this please

@stepanblyschak
return empty strnig in mock_run_command_side_effect
7905df7 
Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
@stepanblyschak
fix call count
b58dac5 
Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
@stepanblyschak
remove the code that was deleted from upstream
bbe8f1a 
Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
yxieca
yxieca previously approved these changes Feb 2, 2021
View reviewed changes
@liat-grozovik
Copy link
Collaborator

liat-grozovik commented Feb 16, 2021

@rajendra-dendukuri and yxieca can you please review again?

@liat-grozovik
Copy link
Collaborator

liat-grozovik commented Feb 25, 2021

@yxieca as it was approved before and we lost you r approval with the recent merge, can you please review and approve so we can move forward with merging it?

liat-grozovik pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Feb 25, 2021
@stepanblyschak
[services] introduce sonic.target (#5705)
e179ec2 
- Why I did it
Group all SONiC services together and able to manage them together. Will be used in config reload command as much simpler and generic way to restart services.

- How I did it
Add services to sonic.target

- How to verify it
Together with sonic-net/sonic-utilities#1199
config reload -y

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
@liat-grozovik liat-grozovik merged commit 8b3bc18 into sonic-net:master Mar 1, 2021
anand-kumar-subramanian pushed a commit to anand-kumar-subramanian/sonic-utilities that referenced this pull request Mar 2, 2021
@stepanblyschak @anand-kumar-subramanian
[reload] Improve reload by using sonic.target. (sonic-net#1199)
4c74ef4 
- What I did
To remove the list of hardcoded order-dependent lists of services to stop/restart/reset-failed.

- How I did it
Used sonic.target to stop/restart/reset-failed.

- How to verify it
Execute config reload and observe the services do restart.

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
yxieca pushed a commit to sonic-net/sonic-buildimage that referenced this pull request Mar 4, 2021
@stepanblyschak @yxieca
[services] introduce sonic.target (#5705)
7fb5a72 
- Why I did it
Group all SONiC services together and able to manage them together. Will be used in config reload command as much simpler and generic way to restart services.

- How I did it
Add services to sonic.target

- How to verify it
Together with sonic-net/sonic-utilities#1199
config reload -y

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
@yozhao101 yozhao101 mentioned this pull request Mar 4, 2021
Merged
@liat-grozovik
Copy link
Collaborator

liat-grozovik commented Mar 7, 2021

@stepanblyschak should we label it for 202012 as well? sonic.target is expected to be included in 202012 if i remember correct.

@stepanblyschak
Copy link
Contributor Author

stepanblyschak commented Mar 9, 2021

@liat-grozovik yes, it looks like we want this feature in 202012 and this PR is crucial part of it.

@daall
Copy link
Contributor

daall commented Mar 10, 2021

@stepanblyschak @liat-grozovik there is a merge conflict when cherry-picking, please open a PR against 202012 branch

@daall
Copy link
Contributor

daall commented Mar 19, 2021

included in 202012 via #1509

@vivekrnv vivekrnv mentioned this pull request Apr 20, 2021
Closed
carl-nokia pushed a commit to carl-nokia/sonic-buildimage that referenced this pull request Aug 7, 2021
@stepanblyschak
[services] introduce sonic.target (sonic-net#5705)
174baa7 
- Why I did it
Group all SONiC services together and able to manage them together. Will be used in config reload command as much simpler and generic way to restart services.

- How I did it
Add services to sonic.target

- How to verify it
Together with sonic-net/sonic-utilities#1199
config reload -y

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
lolyu pushed a commit to lolyu/sonic-buildimage that referenced this pull request Sep 13, 2021
@stepanblyschak @yxieca
[services] introduce sonic.target (sonic-net#5705)
1ef1736 
- Why I did it
Group all SONiC services together and able to manage them together. Will be used in config reload command as much simpler and generic way to restart services.

- How I did it
Add services to sonic.target

- How to verify it
Together with sonic-net/sonic-utilities#1199
config reload -y

Signed-off-by: Stepan Blyshchak <stepanb@nvidia.com>
@qiluo-msft
Copy link
Contributor

qiluo-msft commented Jul 7, 2022

def _get_disabled_services_list(config_db):

This function is not used anymore.

Wondering whether your new code could handle disabled service as before, such as telemetry disabled?

Refers to: config/main.py:703 in bf3d2fd. [](commit_id = bf3d2fd, deletion_comment = True)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yxieca yxieca yxieca approved these changes

@jleveque jleveque Awaiting requested review from jleveque

+1 more reviewer

@rajendra-dendukuri rajendra-dendukuri rajendra-dendukuri approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@stepanblyschak @keboliu @jleveque @liat-grozovik @daall @qiluo-msft @yxieca @rajendra-dendukuri