Skip to content

Commit 2dfc71c

Browse files
committed
lava_callback: Fix crash on missing log from lava callback
Signed-off-by: Denys Fedoryshchenko <[email protected]>
1 parent 5c38a9e commit 2dfc71c

File tree

1 file changed

+17
-13
lines changed

1 file changed

+17
-13
lines changed

src/lava_callback.py

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -278,20 +278,24 @@ def async_job_submit(api_helper, node_id, job_callback):
278278
device_id = job_callback.get_device_id()
279279
storage_config_name = job_callback.get_meta('storage_config_name')
280280
storage = _get_storage(storage_config_name)
281-
log_txt_url = _upload_log(log_parser, job_node, storage)
282-
if log_txt_url:
283-
job_node['artifacts']['lava_log'] = log_txt_url
284-
logger.info(f"Log uploaded to {log_txt_url}")
285-
else:
286-
logger.warning("Failed to upload log")
287-
metrics.add('lava_callback_late_fail_total', 1)
288-
callback_json_url = _upload_callback_data(callback_data, job_node, storage)
289-
if callback_json_url:
290-
job_node['artifacts']['callback_data'] = callback_json_url
291-
logger.info(f"Callback data uploaded to {callback_json_url}")
292-
else:
293-
metrics.add('lava_callback_late_fail_total', 1)
294281

282+
if log_parser:
283+
log_txt_url = _upload_log(log_parser, job_node, storage)
284+
if log_txt_url:
285+
job_node['artifacts']['lava_log'] = log_txt_url
286+
logger.info(f"Log uploaded to {log_txt_url}")
287+
else:
288+
logger.warning("Failed to upload log")
289+
metrics.add('lava_callback_late_fail_total', 1)
290+
callback_json_url = _upload_callback_data(callback_data, job_node, storage)
291+
if callback_json_url:
292+
job_node['artifacts']['callback_data'] = callback_json_url
293+
logger.info(f"Callback data uploaded to {callback_json_url}")
294+
else:
295+
metrics.add('lava_callback_late_fail_total', 1)
296+
else:
297+
logger.warning("No log data found in callback")
298+
job_result = 'incomplete'
295299
# failed LAVA job should have result set to 'incomplete'
296300
job_node['result'] = job_result
297301
job_node['state'] = 'done'

0 commit comments

Comments
 (0)