MAAS

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

  1. Git
  2. lp:~alexsander-souza/maas
  3. revert_aiohttp_workaround
  4. Merge into master
Proposed by Alexsander de Souza
Status: Merged
Approved by: Alexsander de Souza
Approved revision: 00769919a80fcb0af30a47de073b2ad847db004c
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~alexsander-souza/maas:revert_aiohttp_workaround
Merge into: maas:master
Diff against target: 21 lines (+1/-2)
1 file modified
src/maasserver/workflow/bootresource.py (+1/-2)
Reviewer Review Type Date Requested Status
MAAS Lander Approve
Jacopo Rota Approve
Review via email: mp+462259@code.launchpad.net

Commit message

Revert "workaround aiohttp bug"

This reverts commit e17821ee5b7c95b41c3932a3ca3b714ac022f991.

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

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

STATUS: SUCCESS
COMMIT: 00769919a80fcb0af30a47de073b2ad847db004c

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

LANDING
-b revert_aiohttp_workaround 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/4936/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 9d9875c..dc0d314 100644
3--- a/src/maasserver/workflow/bootresource.py
4+++ b/src/maasserver/workflow/bootresource.py
5@@ -24,7 +24,6 @@ HEARTBEAT_TIMEOUT = timedelta(seconds=10)
6 DISK_TIMEOUT = timedelta(minutes=15)
7 DOWNLOAD_TIMEOUT = timedelta(hours=2)
8 MAX_SOURCES = 5
9-CHUNK_SIZE = 5 * (2**20) # 5 MB
10
11
12 @dataclass
13@@ -142,7 +141,7 @@ class BootResourcesActivity(MAASAPIClient):
14 ) as response, lfile.astore(autocommit=False) as store:
15 response.raise_for_status()
16 last_update = datetime.now()
17- async for data in response.content.iter_chunked(CHUNK_SIZE):
18+ async for data, _ in response.content.iter_chunks():
19 activity.heartbeat()
20 dt_now = datetime.now()
21 if dt_now > (last_update + REPORT_INTERVAL):

Subscribers

People subscribed via source and target branches