Skip to content

[config reload] Fixing config reload when timer based delayed services are disabled #1967

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

Merged
qiluo-msft merged 11 commits into from
Jan 6, 2022
Merged

[config reload] Fixing config reload when timer based delayed services are disabled #1967

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
497d9e0
[config reload]Fixing config reload when timer based services are dis…
dgsudharsan Dec 9, 2021
8730bf2
Update main.py
dgsudharsan Dec 9, 2021
c48d6cc
Updating UT
dgsudharsan Dec 10, 2021
ed68ac1
Merge branch 'config_rel_fix2' of github.com:dgsudharsan/sonic-utilit…
dgsudharsan Dec 10, 2021
b1b9679
Addressing code review comments
dgsudharsan Dec 17, 2021
263f3cb
Addressing code review comments
dgsudharsan Dec 17, 2021
e6f3ec0
Addressing code review comments
dgsudharsan Dec 17, 2021
7f0897a
Merge remote-tracking branch 'upstream/master' into config_rel_fix2
dgsudharsan Dec 17, 2021
6bf1631
Merge branch 'master' of github.com:Azure/sonic-utilities into config…
dgsudharsan Dec 20, 2021
93c44e1
Merge remote-tracking branch 'upstream/master' into config_rel_fix2
dgsudharsan Jan 3, 2022
3597962
Merge remote-tracking branch 'upstream/master' into config_rel_fix2
dgsudharsan Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,9 @@ def _get_sonic_services():

def _get_delayed_sonic_services():
out = clicommon.run_command("systemctl list-dependencies --plain sonic-delayed.target | sed '1d'", return_cmd=True)
return (unit.strip().rstrip('.timer') for unit in out.splitlines())
timers = [unit for unit in out.splitlines() if(clicommon.run_command("systemctl is-enabled {}".format(unit),
Copy link
Copy Markdown
Contributor

@qiluo-msft qiluo-msft Dec 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

systemctl

you can use one command to check all the units. You may use xargs to bypass the command line too long issue. #Pending

Copy link
Copy Markdown
Contributor

@qiluo-msft qiluo-msft Dec 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

unit

This statement is too complex. Could you rewrite in traditional control flow, like for-loop or if-block? #Closed

return_cmd=True).strip() == "enabled")]
return (unit.strip().rstrip('.timer') for unit in timers)


def _reset_failed_services():
Expand Down
4 changes: 3 additions & 1 deletion tests/config_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ def mock_run_command_side_effect(*args, **kwargs):
return 'snmp.timer'
elif command == "systemctl list-dependencies --plain sonic.target | sed '1d'":
return 'swss'
elif command == "systemctl is-enabled snmp.timer":
return 'enabled'
else:
return ''

Expand All @@ -92,7 +94,7 @@ def test_load_minigraph(self, get_cmd_module, setup_single_broadcom_asic):
mock_run_command.assert_any_call('systemctl reset-failed swss')
# Verify "systemctl reset-failed" is called for services under sonic-delayed.target
mock_run_command.assert_any_call('systemctl reset-failed snmp')
assert mock_run_command.call_count == 10
assert mock_run_command.call_count == 11
Copy link
Copy Markdown
Collaborator

@liat-grozovik liat-grozovik Dec 11, 2021

Choose a reason for hiding this comment

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

@dgsudharsan what this hard coded number stands for? should we count it in a better way than just a number?

Copy link
Copy Markdown
Collaborator Author

@dgsudharsan dgsudharsan Dec 17, 2021

Choose a reason for hiding this comment

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

I believe the logic is testing for number of calls to clicommon.run_command which is internal implementation. There is no way of knowing it in test script (even in the code). If tomorrow an additional command gets added this needs to be changed again. I agree this is not a deterministic method but its an existing code and I am not sure of the motivation.
For e.g below are the calls internally invoked.
sudo systemctl stop sonic.target --job-mode replace-irreversibly
/usr/local/bin/sonic-cfggen -H -m --write-to-db
config qos reload --no-dynamic-buffer
pfcwd start_default
systemctl list-dependencies --plain sonic.target | sed '1d'
systemctl list-dependencies --plain sonic-delayed.target | sed '1d'
systemctl is-enabled snmp.timer
systemctl reset-failed swss
systemctl reset-failed snmp
sudo systemctl restart sonic.target
sudo monit reload


def test_load_minigraph_with_port_config_bad_format(self, get_cmd_module, setup_single_broadcom_asic):
with mock.patch(
Expand Down