Merge ~alexsander-souza/maas:lp2056223_prettier_logs into maas:master

Proposed by Alexsander de Souza
Status: Merged
Approved by: Alexsander de Souza
Approved revision: 902e708cd1a7192d5a1715f9ef3927bbe9985b17
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~alexsander-souza/maas:lp2056223_prettier_logs
Merge into: maas:master
Diff against target: 52 lines (+13/-11)
1 file modified
src/maasserver/workflow/bootresource.py (+13/-11)
Reviewer Review Type Date Requested Status
Anton Troyanov Approve
MAAS Lander Approve
Review via email: mp+462369@code.launchpad.net

Commit message

refactor(bootresources): show prettier error messages

don't show complete stacktraces for recoverable errors.

fixes LP#2056223

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b lp2056223_prettier_logs lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 902e708cd1a7192d5a1715f9ef3927bbe9985b17

review: Approve
Revision history for this message
Anton Troyanov (troyanov) :
review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

LANDING
-b lp2056223_prettier_logs lp:~alexsander-souza/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED BUILD
LOG: http://maas-ci.internal:8080/job/maas-tester/4964/console

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/workflow/bootresource.py b/src/maasserver/workflow/bootresource.py
2index 5f24189..a1938d0 100644
3--- a/src/maasserver/workflow/bootresource.py
4+++ b/src/maasserver/workflow/bootresource.py
5@@ -5,8 +5,10 @@ from datetime import datetime, timedelta
6 import random
7 from typing import Coroutine, Sequence
8
9+from aiohttp.client_exceptions import ClientError
10 from temporalio import activity, workflow
11 from temporalio.common import RetryPolicy, WorkflowIDReusePolicy
12+from temporalio.exceptions import ApplicationError
13 from temporalio.workflow import ActivityCancellationType
14
15 from maasserver.utils.bootresource import (
16@@ -147,15 +149,7 @@ class BootResourcesActivity(MAASAPIClient):
17 if dt_now > (last_update + REPORT_INTERVAL):
18 await self.report_progress(param.rfile_ids, lfile.size)
19 last_update = dt_now
20- try:
21- store.write(data)
22- except (
23- IOError,
24- LocalStoreInvalidHash,
25- LocalStoreWriteBeyondEOF,
26- ) as ex:
27- activity.logger.warn(f"Download failed {str(ex)}")
28- raise
29+ store.write(data)
30
31 activity.logger.debug("Download done, doing checksum")
32 activity.heartbeat()
33@@ -170,10 +164,18 @@ class BootResourcesActivity(MAASAPIClient):
34 await self.report_progress(param.rfile_ids, lfile.size)
35 return True
36 else:
37- activity.logger.warn("Download failed, invalid checksum")
38 await self.report_progress(param.rfile_ids, 0)
39 lfile.unlink()
40- return False
41+ raise ApplicationError("Invalid checksum")
42+ except (
43+ IOError,
44+ ClientError,
45+ LocalStoreInvalidHash,
46+ LocalStoreWriteBeyondEOF,
47+ ) as ex:
48+ raise ApplicationError(
49+ str(ex), type=ex.__class__.__name__
50+ ) from None
51 finally:
52 lfile.release_lock()
53

Subscribers

People subscribed via source and target branches