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

Add support for updates where both OS and apps are updated #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+71 −54
Open

Add support for updates where both OS and apps are updated #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc9aca
Adapt update process for cases when both OS and apps are updated
v-bertin Jun 10, 2021
1896a4e
Add simple sort algorithm to process OS chunk first
v-bertin Jun 10, 2021
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: 71 additions & 54 deletions fullmetalupdate/fullmetalupdate_ddi_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ async def process_deployment(self, base):
action_id, resource = match.groups()
# fetch deployment information
deploy_info = await self.ddi.deploymentBase[action_id](resource)
reboot_needed = False

chunks_qty = len(deploy_info['deployment']['chunks'])

Expand All @@ -164,9 +163,17 @@ async def process_deployment(self, base):
await self.ddi.deploymentBase[action_id].feedback(
status_execution, status_result, [msg],
percentage=percentage)

# Algorithm to sort chunks : OS chunk first and then Apps chunk
count = 0
for count in range(chunks_qty):
if deploy_info['deployment']['chunks'][count]['part'] == 'os':
deploy_info['deployment']['chunks'].insert(0, deploy_info['deployment']['chunks'][count])
del deploy_info['deployment']['chunks'][count + 1]
break

self.action_id = action_id

final_result_os = True
seq = ('name', 'version', 'rev', 'part', 'autostart', 'autoremove', 'status_execution', 'status_update', 'status_result', 'notify', 'timeout')
updates = []

Expand Down Expand Up @@ -196,33 +203,40 @@ async def process_deployment(self, base):
# checking if we just rebooted and we need to send the feedback in which
# case we don't need to pull the update image again
[feedback, reboot_data] = self.feedback_for_os_deployment(update['rev'])
if feedback:
await self.ddi.deploymentBase[reboot_data['action_id']].feedback(
DeploymentStatusExecution(reboot_data['status_execution']),
DeploymentStatusResult(reboot_data['status_result']),
[reboot_data['msg']])
self.action_id = None
return

self.logger.info("OS {} v.{} - updating...".format(update['name'], update['version']))
update['status_update'] = self.update_system(update['rev'])
update['status_execution'] = DeploymentStatusExecution.closed
if not update['status_update']:
msg = "OS {} v.{} Deployment failed".format(update['name'], update['version'])
self.logger.error(msg)
update['status_result'] = DeploymentStatusResult.failure
await self.ddi.deploymentBase[self.action_id].feedback(
update['status_execution'], update['status_result'], [msg])
return
if feedback:
final_result_os = (DeploymentStatusResult(reboot_data['status_result']) == DeploymentStatusResult.success)
if not final_result_os:
self.logger.info(reboot_data['msg'])
await self.ddi.deploymentBase[reboot_data['action_id']].feedback(
DeploymentStatusExecution(reboot_data['status_execution']),
DeploymentStatusResult(reboot_data['status_result']),
[reboot_data['msg']])
action_id = None
return

else:
msg = "OS {} v.{} Deployment succeed".format(update['name'], update['version'])
self.logger.info(msg)
update['status_result'] = DeploymentStatusResult.success
reboot_needed = True
self.write_reboot_data(self.action_id,
update['status_execution'],
update['status_result'],
msg)
self.logger.info("OS {} v.{} - updating...".format(update['name'], update['version']))
update['status_update'] = self.update_system(update['rev'])
update['status_execution'] = DeploymentStatusExecution.closed
if not update['status_update']:
msg = "OS {} v.{} Deployment failed".format(update['name'], update['version'])
self.logger.error(msg)
update['status_result'] = DeploymentStatusResult.failure
await self.ddi.deploymentBase[self.action_id].feedback(
update['status_execution'], update['status_result'], [msg])
return
else:
msg = "OS {} v.{} Deployment succeed".format(update['name'], update['version'])
self.logger.info(msg)
update['status_result'] = DeploymentStatusResult.success
self.write_reboot_data(self.action_id,
update['status_execution'],
update['status_result'],
msg)
try:
subprocess.run("reboot")
except subprocess.CalledProcessError as e:
self.logger.error("Reboot failed: {}".format(e))

elif update['part'] == 'bApp':
self.logger.info("App {} v.{} - updating...".format(update['name'], update['version']))
Expand All @@ -241,8 +255,10 @@ async def process_deployment(self, base):
for update in updates:
update['status_update'] &= self.handle_container(update['name'], update['autostart'], update['autoremove'])

final_result = True
final_result_apps = True
fails = ""
feedbackMsg = ""
notifyMsg = ""
feedbackThreadIt = iter(self.feedbackThreads)

# Hawkbit server feedback process
Expand All @@ -255,33 +271,34 @@ async def process_deployment(self, base):
self.mutexResults.release()

if not update['status_update']:
msg = "App {} v.{} Deployment failed\n {}".format(update['name'], update['version'], feedbackMsg)
self.logger.error(msg)
update['status_result'] = DeploymentStatusResult.failure
fails += update['name'] + " "
msg = "App {} v.{} Deployment failed : {}\n".format(update['name'], update['version'], feedbackMsg)
notifyMsg += msg
self.logger.error(msg)
update['status_result'] = DeploymentStatusResult.failure
fails += update['name'] + " "
else:
msg = "App {} v.{} Deployment succeed".format(update['name'], update['version'])
self.logger.info(msg)
update['status_result'] = DeploymentStatusResult.success

final_result &= (update['status_result'] == DeploymentStatusResult.success)

if(final_result):
msg = "Hawkbit Update Success : All applications have been updated and correctly restarted."
self.logger.info(msg)
status_result = DeploymentStatusResult.success
else:
msg = "Hawkbit Update Failure : " + fails + "failed to update and / or to restart."
self.logger.error(msg)
status_result = DeploymentStatusResult.failure
await self.ddi.deploymentBase[self.action_id].feedback(DeploymentStatusExecution.closed, status_result, [msg])

msg = "App {} v.{} Deployment succeed\n".format(update['name'], update['version'])
notifyMsg += msg
self.logger.info(msg)
update['status_result'] = DeploymentStatusResult.success

final_result_apps &= (update['status_result'] == DeploymentStatusResult.success)

if updates:
if(final_result_apps):
msg = "Hawkbit Update Success : All applications have been updated and correctly restarted."
self.logger.info(msg)
status_result = DeploymentStatusResult.success
else:
msg = "Hawkbit Update Failure : " + fails + "failed to update and / or to restart."
self.logger.error(msg)
status_result = DeploymentStatusResult.failure
notifyMsg = msg + "\n" + notifyMsg
if feedback:
notifyMsg += reboot_data['msg']

await self.ddi.deploymentBase[self.action_id].feedback(DeploymentStatusExecution.closed, status_result, [notifyMsg])
self.action_id = None
if reboot_needed:
try:
subprocess.run("reboot")
except subprocess.CalledProcessError as e:
self.logger.error("Reboot failed: {}".format(e))

async def sleep(self, base):
"""
Expand Down