← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/stop-creating-delayed-copies into lp:launchpad

 

Colin Watson has proposed merging lp:~cjwatson/launchpad/stop-creating-delayed-copies into lp:launchpad.

Commit message:
Convert Archive.syncSource/syncSources to the unembargo method, rather than creating delayed copies.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1078283 in Launchpad itself: "Stop creating delayed copies in Archive.syncSource/syncSources"
  https://bugs.launchpad.net/launchpad/+bug/1078283

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/stop-creating-delayed-copies/+merge/134098

== Summary ==

We'd like to get rid of delayed copies.  Before doing that, we need to stop creating them, wait for a deployment, and ensure there are none left pending.

== Proposed fix ==

https://code.launchpad.net/~cjwatson/launchpad/always-copy-packages-asynchronously-2/+merge/131928 fixes part of this.  Switching syncSource/syncSources over to the unembargo method deals with the rest.

== Tests ==

bin/test -vvct soyuz

== Demo and Q/A ==

Copy something from a private archive to a public one on dogfood using Archive.syncSource, and verify that its files are properly unrestricted.

== Lint ==

Just some pre-existing long lines in a doctest:

./lib/lp/soyuz/stories/webservice/xx-archive.txt
      43: want exceeds 78 characters.
      47: want exceeds 78 characters.
     173: want exceeds 78 characters.
     190: want exceeds 78 characters.
     207: want exceeds 78 characters.
     224: want exceeds 78 characters.
     271: want exceeds 78 characters.
     272: want exceeds 78 characters.
     396: want exceeds 78 characters.
     457: want exceeds 78 characters.
     588: want exceeds 78 characters.
     647: want exceeds 78 characters.
     726: want exceeds 78 characters.
     751: want exceeds 78 characters.
     753: want exceeds 78 characters.
-- 
https://code.launchpad.net/~cjwatson/launchpad/stop-creating-delayed-copies/+merge/134098
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/stop-creating-delayed-copies into lp:launchpad.
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2012-11-03 13:49:04 +0000
+++ lib/lp/soyuz/model/archive.py	2012-11-13 13:48:37 +0000
@@ -1100,9 +1100,6 @@
 
     def hasAnyPermission(self, person):
         """See `IArchive`."""
-        # Avoiding circular imports.
-        from lp.soyuz.model.archivepermission import ArchivePermission
-
         any_perm_on_archive = Store.of(self).find(
             TeamParticipation,
             ArchivePermission.archive == self.id,
@@ -1822,7 +1819,7 @@
         # permissions.
         do_copy(
             sources, self, series, pocket, include_binaries, person=person,
-            check_permissions=False, allow_delayed_copies=True)
+            check_permissions=False, unembargo=True)
 
     def getAuthToken(self, person):
         """See `IArchive`."""
@@ -2356,9 +2353,6 @@
 
     def getPPAsForUser(self, user):
         """See `IArchiveSet`."""
-        # Avoiding circular imports.
-        from lp.soyuz.model.archivepermission import ArchivePermission
-
         # If there's no user logged in, then there's no archives.
         if user is None:
             return []

=== modified file 'lib/lp/soyuz/stories/webservice/xx-archive.txt'
--- lib/lp/soyuz/stories/webservice/xx-archive.txt	2012-08-19 00:32:32 +0000
+++ lib/lp/soyuz/stories/webservice/xx-archive.txt	2012-11-13 13:48:37 +0000
@@ -1374,7 +1374,7 @@
     HTTP/1.1 400 Bad Request
     ...
     foocomm 1.0-2 in hoary
-    (same version already uploaded and waiting in ACCEPTED queue)
+    (same version already building in the destination archive for Hoary)
 
 Suppressing notifications
 -------------------------


Follow ups