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

[multi-asic]: Update reload of systemd services to support multi-asic platforms #856

Merged
merged 8 commits into from
Mar 25, 2020
Merged

[multi-asic]: Update reload of systemd services to support multi-asic platforms #856

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac08ac6
Update stop, reset failed status and restart of systemd services
SuvarnaMeenakshi Mar 24, 2020
b3bd6c7
Create function to avoid code duplication.
SuvarnaMeenakshi Mar 24, 2020
5b70baf
Fixed errors due to pervious commit and review comments.
SuvarnaMeenakshi Mar 24, 2020
ac6e5a3
Minor update to fix spacing.
SuvarnaMeenakshi Mar 25, 2020
c8bcef7
Minor update to fix spacing.
SuvarnaMeenakshi Mar 25, 2020
4396f3a
Minor update to fix spacing.
SuvarnaMeenakshi Mar 25, 2020
532bba8
For multi asic platform updated logic of stopping/restarting of
SuvarnaMeenakshi Mar 25, 2020
f2959ca
Fixed log error message with incorrect number of parameterts.
SuvarnaMeenakshi Mar 25, 2020
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
125 changes: 91 additions & 34 deletions config/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
SONIC_CFGGEN_PATH = '/usr/local/bin/sonic-cfggen'
SYSLOG_IDENTIFIER = "config"
VLAN_SUB_INTERFACE_SEPARATOR = '.'
ASIC_CONF_FILENAME = 'asic.conf'

INIT_CFG_FILE = '/etc/sonic/init_cfg.json'

Expand Down Expand Up @@ -395,14 +396,33 @@ def _get_platform():
return tokens[1].strip()
return ''

def _get_num_asic():
platform = _get_platform()
asic_conf_file = os.path.join('/usr/share/sonic/device/', platform, ASIC_CONF_FILENAME)
if not os.path.isfile(asic_conf_file):
num_asic=1
lguohan marked this conversation as resolved.
Show resolved Hide resolved
else:
with open(asic_conf_file) as conf_file:
for line in conf_file:
line_info=line.split('=')
lguohan marked this conversation as resolved.
Show resolved Hide resolved
if line_info[0] == "NUM_ASIC":
print line_info[1]
lguohan marked this conversation as resolved.
Show resolved Hide resolved
num_asic=int(line_info[1])
lguohan marked this conversation as resolved.
Show resolved Hide resolved
return num_asic

def _get_sonic_generated_services():
if not os.path.isfile(SONIC_GENERATED_SERVICE_PATH):
return None
generated_services_list = []
generated_multi_instance_services = []
with open(SONIC_GENERATED_SERVICE_PATH) as generated_service_file:
for line in generated_service_file:
generated_services_list.append(line.rstrip('\n'))
return None if not generated_services_list else generated_services_list
if '@' in line:
line=line.replace('@', '')
generated_multi_instance_services.append(line.rstrip('\n'))
else:
generated_services_list.append(line.rstrip('\n'))
lguohan marked this conversation as resolved.
Show resolved Hide resolved
return generated_services_list, generated_multi_instance_services

# Callback for confirmation prompt. Aborts if user enters "n"
def _abort_if_false(ctx, param, value):
Expand All @@ -419,25 +439,37 @@ def _stop_services():
'hostcfgd',
'nat'
]
generated_services_list = _get_sonic_generated_services()

if generated_services_list is None:
num_asic = _get_num_asic()
generated_services_list, generated_multi_instance_services = _get_sonic_generated_services()

if ((generated_services_list == []) and
(generated_multi_instance_services == [])):
log_error("Failed to get generated services")
return

if asic_type == 'mellanox' and 'pmon' in services_to_stop:
services_to_stop.remove('pmon')
lguohan marked this conversation as resolved.
Show resolved Hide resolved

for service in services_to_stop:
if service + '.service' not in generated_services_list:
continue
try:
click.echo("Stopping service {} ...".format(service))
run_command("systemctl stop {}".format(service))

except SystemExit as e:
log_error("Stopping {} failed with error {}".format(service, e))
raise
if ((service + '.service' in generated_services_list) or
((service + '.service' in generated_multi_instance_services) and
(num_asic == 1))):
try:
click.echo("Stopping service {}...".format(service))
run_command("systemctl stop {}".format(service))
except SystemExit as e:
log_error("Stopping {} failed with error {}".format(service, e))
raise
if ((service + '.service' in generated_multi_instance_services) and
(num_asic > 1)):
for inst in range(num_asic):
try:
click.echo("Stopping service {}@{}.service...".format(service, inst))
run_command("systemctl stop {}@{}.service".format(service, inst))
except SystemExit as e:
log_error("Stopping {}@{}.service failed with error {}".format(service, inst, e))
raise

def _reset_failed_services():
services_to_reset = [
Expand All @@ -459,21 +491,33 @@ def _reset_failed_services():
'sflow'
]

generated_services_list = _get_sonic_generated_services()

if generated_services_list is None:
num_asic = _get_num_asic()
generated_services_list, generated_multi_instance_services = _get_sonic_generated_services()
if ((generated_services_list == []) and
(generated_multi_instance_services == [])):
log_error("Failed to get generated services")
return

for service in services_to_reset:
if service + '.service' not in generated_services_list:
continue
try:
click.echo("Resetting failed status for service {} ...".format(service))
run_command("systemctl reset-failed {}".format(service))
except SystemExit as e:
log_error("Failed to reset failed status for service {}".format(service))
raise
if ((service + '.service' in generated_services_list) or
((service + '.service' in generated_multi_instance_services) and
(num_asic == 1))):
try:
click.echo("Resetting failed status for service {}...".format(service))
run_command("systemctl reset-failed {}".format(service))
except SystemExit as e:
log_error("Failed to reset failed status for service {}".format(service))
raise
if ((service + '.service' in generated_multi_instance_services) and
(num_asic > 1)):
for inst in range(num_asic):
try:
click.echo("Resetting failed status for service {}@{}.service...".format(service, inst))
run_command("systemctl reset-failed {}@{}.service".format(service, inst))
except SystemExit as e:
log_error("Failed to reset failed status for service {}@{}.service".format(service, inst))
raise


def _restart_services():
# on Mellanox platform pmon is started by syncd
Expand All @@ -490,24 +534,37 @@ def _restart_services():
'nat',
'sflow',
]
generated_services_list = _get_sonic_generated_services()

if generated_services_list is None:
num_asic = _get_num_asic()
generated_services_list, generated_multi_instance_services = _get_sonic_generated_services()

if ((generated_services_list == []) and
(generated_multi_instance_services == [])):
log_error("Failed to get generated services")
return

if asic_type == 'mellanox' and 'pmon' in services_to_restart:
services_to_restart.remove('pmon')

for service in services_to_restart:
if service + '.service' not in generated_services_list:
continue
try:
click.echo("Restarting service {} ...".format(service))
run_command("systemctl restart {}".format(service))
except SystemExit as e:
log_error("Restart {} failed with error {}".format(service, e))
raise
if ((service + '.service' in generated_services_list) or
Copy link
Contributor

Choose a reason for hiding this comment

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

duplicated code as above. please use function to reduce the duplicated code.

Copy link
Contributor

Choose a reason for hiding this comment

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

looks like the code is duplicated three times

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated code as per comment.

((service + '.service' in generated_multi_instance_services) and
(num_asic == 1))):
try:
click.echo("Restarting service {}...".format(service))
run_command("systemctl restart {}".format(service))
except SystemExit as e:
log_error("Restart {} failed with error {}".format(service, e))
raise
if ((service + '.service' in generated_multi_instance_services) and
(num_asic > 1)):
for inst in range(num_asic):
try:
click.echo("Restarting service {}@{}.service...".format(service, inst))
run_command("systemctl restart {}@{}.service".format(service, inst))
except SystemExit as e:
log_error("Restart {}@{}.service failed with error {}".format(service, inst,e))
raise

def is_ipaddress(val):
""" Validate if an entry is a valid IP """
Expand Down