Merge lp:~allenap/maas/compress-leases--bug-1387515 into lp:~maas-committers/maas/trunk

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 3318
Proposed branch: lp:~allenap/maas/compress-leases--bug-1387515
Merge into: lp:~maas-committers/maas/trunk
Prerequisite: lp:~allenap/maas/compressed-amp-list--bug-1387515
Diff against target: 20 lines (+2/-1)
1 file modified
src/provisioningserver/rpc/region.py (+2/-1)
To merge this branch: bzr merge lp:~allenap/maas/compress-leases--bug-1387515
Reviewer Review Type Date Requested Status
Graham Binns (community) Approve
Review via email: mp+240103@code.launchpad.net

Commit message

Use CompressedAmpList in UpdateLeases.

Previously this call would fail with more than ~1450 leases. It will now work with up to ~3500 leases.

To post a comment you must log in.
Revision history for this message
Graham Binns (gmb) :
review: Approve
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Is it possible to backport this to 1.7 as OIL is being affected? Thanks
On Oct 30, 2014 7:34 AM, "Gavin Panella" <email address hidden>
wrote:

> Gavin Panella has proposed merging
> lp:~allenap/maas/compress-leases--bug-1387515 into lp:maas with
> lp:~allenap/maas/compressed-amp-list--bug-1387515 as a prerequisite.
>
> Commit message:
> Use CompressedAmpList in UpdateLeases.
>
> Previously this call would fail with more than ~1450 leases. It will now
> work with up to ~3500 leases.
>
> Requested reviews:
> MAAS Maintainers (maas-maintainers)
> Related bugs:
> Bug #1387515 in MAAS: "Failed to upload leases"
> https://bugs.launchpad.net/maas/+bug/1387515
>
> For more details, see:
>
> https://code.launchpad.net/~allenap/maas/compress-leases--bug-1387515/+merge/240103
> --
>
> https://code.launchpad.net/~allenap/maas/compress-leases--bug-1387515/+merge/240103
> You are subscribed to branch lp:maas.
>
> === modified file 'src/provisioningserver/rpc/region.py'
> --- src/provisioningserver/rpc/region.py 2014-10-09 21:43:07 +0000
> +++ src/provisioningserver/rpc/region.py 2014-10-30 11:32:47 +0000
> @@ -43,6 +43,7 @@
> from provisioningserver.rpc.arguments import (
> Bytes,
> Choice,
> + CompressedAmpList,
> ParsedURL,
> StructureAsJSON,
> )
> @@ -163,7 +164,7 @@
> arguments = [
> # The cluster UUID.
> (b"uuid", amp.Unicode()),
> - (b"mappings", amp.AmpList(
> + (b"mappings", CompressedAmpList(
> [(b"ip", amp.Unicode()),
> (b"mac", amp.Unicode())]))
> ]
>
>
>

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/rpc/region.py'
2--- src/provisioningserver/rpc/region.py 2014-10-09 21:43:07 +0000
3+++ src/provisioningserver/rpc/region.py 2014-10-30 11:36:22 +0000
4@@ -43,6 +43,7 @@
5 from provisioningserver.rpc.arguments import (
6 Bytes,
7 Choice,
8+ CompressedAmpList,
9 ParsedURL,
10 StructureAsJSON,
11 )
12@@ -163,7 +164,7 @@
13 arguments = [
14 # The cluster UUID.
15 (b"uuid", amp.Unicode()),
16- (b"mappings", amp.AmpList(
17+ (b"mappings", CompressedAmpList(
18 [(b"ip", amp.Unicode()),
19 (b"mac", amp.Unicode())]))
20 ]