-
Notifications
You must be signed in to change notification settings - Fork 85
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
sonic-host-services changes for gNOI Warm Reboot #191
Open
rkavitha-hcl
wants to merge
2
commits into
sonic-net:master
Choose a base branch
from
rkavitha-hcl:gnoi_wr_hs_new
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,151 @@ | ||
"""gNOI reboot module which performs reboot""" | ||
|
||
import json | ||
import logging | ||
import threading | ||
import time | ||
from host_modules import host_service | ||
from utils.run_cmd import _run_command | ||
|
||
MOD_NAME = 'gnoi_reboot' | ||
# Reboot method in reboot request | ||
# Both enum and string representations are supported | ||
REBOOTMETHOD_COLD_BOOT_VALUES = {1, "COLD"} | ||
REBOOTMETHOD_WARM_BOOT_VALUES = {4, "WARM"} | ||
|
||
# Timeout for SONiC Host Service to be killed during reboot | ||
REBOOT_TIMEOUT = 260 | ||
|
||
EXECUTE_COLD_REBOOT_COMMAND = "sudo reboot" | ||
EXECUTE_WARM_REBOOT_COMMAND = "/usr/local/bin/warm-reboot -v" | ||
|
||
logger = logging.getLogger(__name__) | ||
|
||
|
||
class GnoiReboot(host_service.HostModule): | ||
"""DBus endpoint that executes the reboot and returns the reboot status | ||
""" | ||
|
||
def __init__(self, mod_name): | ||
"""Use threading.lock mechanism to read/write into response_data | ||
since response_data can be read/write by multiple threads""" | ||
self.lock = threading.Lock() | ||
# reboot_status_flag is used to keep track of reboot status on host | ||
self.reboot_status_flag = {} | ||
# Populating with default value i.e., no active reboot | ||
self.populate_reboot_status_flag() | ||
super(GnoiReboot, self).__init__(mod_name) | ||
|
||
def populate_reboot_status_flag(self, active = False, when = 0, reason = ""): | ||
"""Populates the reboot_status_flag with given input params""" | ||
self.lock.acquire() | ||
self.reboot_status_flag["active"] = active | ||
self.reboot_status_flag["when"] = when | ||
self.reboot_status_flag["reason"] = reason | ||
self.lock.release() | ||
return | ||
|
||
def validate_reboot_request(self, reboot_request): | ||
# Check whether reboot method is present. | ||
if "method" not in reboot_request: | ||
return 1, "Reboot request must contain a reboot method" | ||
|
||
# Check whether reboot method is valid. | ||
rebootmethod = reboot_request["method"] | ||
valid_method = False | ||
for values in [REBOOTMETHOD_COLD_BOOT_VALUES, REBOOTMETHOD_WARM_BOOT_VALUES]: | ||
if rebootmethod in values: | ||
valid_method = True | ||
if not valid_method: | ||
return 1, "Invalid reboot method: " + str(rebootmethod) | ||
|
||
# Check whether delay is non-zero. delay key will not exist in reboot_request if it is zero | ||
if "delay" in reboot_request and reboot_request["delay"] != 0: | ||
return 1, "Delayed reboot is not supported" | ||
return 0, "" | ||
|
||
def execute_reboot(self, rebootmethod): | ||
"""Execute reboot and reset reboot_status_flag when reboot fails""" | ||
|
||
if rebootmethod in REBOOTMETHOD_COLD_BOOT_VALUES: | ||
command = EXECUTE_COLD_REBOOT_COMMAND | ||
logger.warning("%s: Issuing cold reboot", MOD_NAME) | ||
elif rebootmethod in REBOOTMETHOD_WARM_BOOT_VALUES: | ||
command = EXECUTE_WARM_REBOOT_COMMAND | ||
logger.warning("%s: Issuing WARM reboot", MOD_NAME) | ||
else: | ||
logger.error("%s: Invalid reboot method: %d", MOD_NAME, rebootmethod) | ||
return | ||
|
||
rc, stdout, stderr = _run_command(command) | ||
if rc: | ||
self.populate_reboot_status_flag() | ||
logger.error("%s: Reboot failed execution with stdout: %s, " | ||
"stderr: %s", MOD_NAME, stdout, stderr) | ||
return | ||
|
||
"""Wait for 260 seconds for the reboot to complete. Here, we expect that SONiC Host Service | ||
will be killed during this waiting period if the reboot is successful. If this module | ||
is still alive after the below waiting period, we can conclude that the reboot has failed. | ||
Each container can take up to 20 seconds to get killed. In total, there are 10 containers, | ||
and adding a buffer of 1 minute brings up the delay value to be 260 seconds.""" | ||
time.sleep(REBOOT_TIMEOUT) | ||
# Conclude that the reboot has failed if we reach this point | ||
self.populate_reboot_status_flag() | ||
return | ||
|
||
@host_service.method(host_service.bus_name(MOD_NAME), in_signature='as', out_signature='is') | ||
def issue_reboot(self, options): | ||
"""Issues reboot after performing the following steps sequentially: | ||
1. Checks that reboot_status_flag is not set | ||
2. Validates the reboot request | ||
3. Sets the reboot_status_flag | ||
4. Issues the reboot in a separate thread | ||
""" | ||
logger.warning("%s: issue_reboot rpc called", MOD_NAME) | ||
self.lock.acquire() | ||
is_reboot_ongoing = self.reboot_status_flag["active"] | ||
self.lock.release() | ||
# Return without issuing the reboot if the previous reboot is ongoing | ||
if is_reboot_ongoing: | ||
return 1, "Previous reboot is ongoing" | ||
|
||
"""Convert input json formatted reboot request into python dict. | ||
reboot_request is a python dict with the following keys: | ||
method - specifies the method of reboot | ||
delay - delay to issue reboot, key exists only if it is non-zero | ||
message - reason for reboot | ||
force - either true/false, key exists only if it is true | ||
""" | ||
try: | ||
reboot_request = json.loads(options[0]) | ||
except ValueError: | ||
return 1, "Failed to parse json formatted reboot request into python dict" | ||
|
||
# Validate reboot request | ||
err, errstr = self.validate_reboot_request(reboot_request) | ||
if err: | ||
return err, errstr | ||
|
||
# Sets reboot_status_flag to be in active state | ||
self.populate_reboot_status_flag(True, int(time.time()), reboot_request["message"]) | ||
|
||
# Issue reboot in a new thread and reset the reboot_status_flag if the reboot fails | ||
try: | ||
t = threading.Thread(target=self.execute_reboot, args=(reboot_request["method"],)) | ||
t.start() | ||
except RuntimeError as error: | ||
return 1, "Failed to start thread to execute reboot with error: " + str(error) | ||
return 0, "Successfully issued reboot" | ||
|
||
@host_service.method(host_service.bus_name(MOD_NAME), in_signature='', out_signature='is') | ||
def get_reboot_status(self): | ||
"""Returns current reboot status on host in json format""" | ||
self.lock.acquire() | ||
response_data = json.dumps(self.reboot_status_flag) | ||
self.lock.release() | ||
return 0, response_data | ||
|
||
def register(): | ||
"""Return the class name""" | ||
return GnoiReboot, MOD_NAME |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,7 +30,8 @@ | |
maintainer = 'Joe LeVeque', | ||
maintainer_email = '[email protected]', | ||
packages = [ | ||
'host_modules' | ||
'host_modules', | ||
'utils', | ||
], | ||
scripts = [ | ||
'scripts/caclmgrd', | ||
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@hdwhdw @qiluo-msft Can you pls confirm this is the right command to invoke warm reboot in SONiC ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yess. https://github.com/sonic-net/sonic-utilities/blob/34d2c8ce007b077b75a29ade8f0876374f66f21f/scripts/warm-reboot#L1