Skip to content

[generic_config_updater] Minor update - No logical code change #2028

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
renukamanavalan merged 29 commits into from
Jan 20, 2022
Merged

[generic_config_updater] Minor update - No logical code change #2028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
7863b59
ChangeApplier and unit test code.
renukamanavalan Oct 1, 2021
84f493b
minor update
renukamanavalan Oct 4, 2021
dd337eb
fix unused import
renukamanavalan Oct 4, 2021
6e0bba0
Added service validation
renukamanavalan Oct 11, 2021
cabcf23
Take off added code for logging
renukamanavalan Oct 19, 2021
a075606
Merge remote-tracking branch 'upstream/master' into updater
renukamanavalan Oct 19, 2021
bd7781c
fix merge
renukamanavalan Oct 19, 2021
f839e53
change applier & test updated for service validation
renukamanavalan Oct 20, 2021
beb1ea7
removed unused import
renukamanavalan Oct 20, 2021
fe25d2e
Added two service validators
renukamanavalan Oct 20, 2021
fec8f8f
move global to class; No logical code changes
renukamanavalan Oct 24, 2021
7d90266
A fix in file path
renukamanavalan Oct 27, 2021
91f8f7e
Merge remote-tracking branch 'upstream/master' into updater
renukamanavalan Oct 27, 2021
6cd9dd8
1) Copy generic_updater_config.conf.json as part of install
renukamanavalan Nov 2, 2021
5a9434b
Merge remote-tracking branch 'upstream/master' into updater
renukamanavalan Nov 2, 2021
30feec2
Prune only empty tables
renukamanavalan Nov 3, 2021
8cd17fd
file rename
renukamanavalan Nov 10, 2021
7533ed1
Merge remote-tracking branch 'upstream/master' into updater
renukamanavalan Nov 10, 2021
9abb300
1) Drop print to stdout from change_applier
renukamanavalan Nov 16, 2021
a41052b
No logical code changes; Name changes only, per review comments
renukamanavalan Nov 22, 2021
d37b350
Merge remote-tracking branch 'upstream/master' into updater
renukamanavalan Jan 13, 2022
3bd91b5
Handle failed restart
renukamanavalan Jan 18, 2022
f520752
Add pause, only if restart fails even after reset
renukamanavalan Jan 19, 2022
e66ce4a
Added test code
renukamanavalan Jan 19, 2022
d280814
Dropped redundant test code
renukamanavalan Jan 19, 2022
f30ff36
minor
renukamanavalan Jan 19, 2022
b212f43
Missed to push a minor change per review comments.
renukamanavalan Jan 20, 2022
f3e0fe2
Merge remote-tracking branch 'upstream/master' into updater
renukamanavalan Jan 20, 2022
9d5240d
Updated test code matching minor change in code per review comments
renukamanavalan Jan 20, 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
3 changes: 2 additions & 1 deletion generic_config_updater/services_validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import os
import time
from .gu_common import genericUpdaterLogging

logger = genericUpdaterLogging.get_logger(title="Service Validator")
Expand Down Expand Up @@ -33,7 +34,7 @@ def _service_restart(svc_name):
logger.log(logger.LOG_PRIORITY_ERROR,
f"Restart failed for {svc_name} rc={rc} after reset; Pause for 10s & retry",
print_to_console)
os.system("sleep 10s")
time.sleep(10)
rc = os.system(f"systemctl restart {svc_name}")

if rc == 0:
Expand Down
1 change: 0 additions & 1 deletion tests/generic_config_updater/service_validator_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ def mock_os_system_call(cmd):
{ "cmd": "systemctl restart rsyslog", "rc": 1 }, # rsyslog restart; fails
{ "cmd": "systemctl reset-failed rsyslog", "rc": 1 }, # reset; failure here just logs
{ "cmd": "systemctl restart rsyslog", "rc": 1 }, # restart again; fails
{ "cmd": "sleep 10s", "rc": 0 }, # sleep; rc ignored
{ "cmd": "systemctl restart rsyslog", "rc": 1 }, # restart again; fails
]

Expand Down