Merge lp://staging/~mwhudson/launchpad/no-hosted-area into lp://staging/launchpad
Proposed by
Michael Hudson-Doyle
Status: | Merged |
---|---|
Approved by: | Tim Penhey |
Approved revision: | no longer in the source branch. |
Merged at revision: | 10828 |
Proposed branch: | lp://staging/~mwhudson/launchpad/no-hosted-area |
Merge into: | lp://staging/launchpad |
Diff against target: |
9694 lines (+3175/-2889) 146 files modified
Makefile (+4/-5) bzrplugins/lpserve.py (+4/-4) configs/development/launchpad-lazr.conf (+2/-2) configs/testrunner/launchpad-lazr.conf (+3/-7) cronscripts/merge-proposal-jobs.py (+22/-30) cronscripts/mirror-prober.sh (+2/-2) cronscripts/nightly.sh (+14/-14) cronscripts/publishing/cron.germinate (+1/-1) cronscripts/publishing/maintenance-check.py (+217/-29) cronscripts/update_preview_diffs.py (+0/-38) database/replication/Makefile (+15/-36) database/replication/authdb_create.sql (+0/-885) database/replication/authdb_drop.sql (+0/-14) database/replication/authdb_sequences.sql (+0/-22) database/replication/helpers.py (+13/-30) database/replication/initialize.py (+7/-54) database/replication/new-slave.py (+37/-43) database/replication/populate_auth_replication_set.py (+0/-177) database/replication/preamble.py (+1/-1) database/replication/repair-restored-db.py (+1/-1) database/replication/report.py (+1/-1) database/replication/slon_ctl.py (+1/-1) database/replication/sync.py (+1/-1) database/schema/diagram.py (+1/-1) database/schema/emptytables.py (+1/-1) database/schema/fti.py (+1/-1) database/schema/online_fti_updater.py (+1/-1) database/schema/patch-2207-47-0.sql (+6/-0) database/schema/patch-2207-48-0.sql (+27/-0) database/schema/pending/add-mailing-list-experts.py (+1/-1) database/schema/pending/create-openid-rp-configs.py (+1/-1) database/schema/pending/gnu-savannah-celebrity.py (+1/-1) database/schema/pending/migrate_kde_potemplates.py (+1/-1) database/schema/pending/new-person-columns.py (+1/-1) database/schema/pending/patch-2207-49-0.sql (+16/-0) database/schema/pending/prune-nonce.py (+1/-1) database/schema/pending/update-shippingrequest-types.py (+1/-1) database/schema/pending/update-translation-credits.py (+3/-3) database/schema/reset_sequences.py (+1/-1) database/schema/security.cfg (+10/-96) database/schema/security.py (+1/-1) database/schema/sort_sql.py (+1/-1) database/schema/trusted.sql (+33/-33) database/schema/unautovacuumable.py (+1/-1) database/schema/upgrade.py (+5/-4) lib/canonical/config/schema-lazr.conf (+28/-0) lib/canonical/launchpad/daemons/tachandler.py (+4/-4) lib/canonical/launchpad/doc/product-update-remote-product-script.txt (+1/-1) lib/canonical/launchpad/scripts/garbo.py (+2/-151) lib/canonical/launchpad/scripts/tests/test_garbo.py (+0/-56) lib/contrib/glock.py (+1/-1) lib/lp/answers/doc/expiration.txt (+1/-1) lib/lp/archivepublisher/publishing.py (+31/-1) lib/lp/archivepublisher/scripts/generate_ppa_htaccess.py (+8/-1) lib/lp/archivepublisher/tests/test_generate_ppa_htaccess.py (+42/-0) lib/lp/archivepublisher/tests/test_publisher.py (+51/-31) lib/lp/bugs/browser/bugwatch.py (+60/-1) lib/lp/bugs/browser/configure.zcml (+6/-0) lib/lp/bugs/browser/tests/bugwatch-views.txt (+83/-1) lib/lp/bugs/configure.zcml (+4/-1) lib/lp/bugs/doc/bug-watch-activity.txt (+9/-5) lib/lp/bugs/doc/bugnotification-sending.txt (+1/-1) lib/lp/bugs/doc/bugtask-expiration.txt (+1/-1) lib/lp/bugs/doc/bugtask.txt (+1/-1) lib/lp/bugs/doc/bugwatch.txt (+84/-0) lib/lp/bugs/doc/checkwatches.txt (+1/-1) lib/lp/bugs/doc/cve-update.txt (+2/-2) lib/lp/bugs/interfaces/bugwatch.py (+52/-0) lib/lp/bugs/model/bugwatch.py (+63/-3) lib/lp/bugs/scripts/bugheat.py (+5/-5) lib/lp/bugs/scripts/checkwatches/scheduler.py (+4/-4) lib/lp/bugs/scripts/tests/test_bugheat.py (+3/-3) lib/lp/bugs/stories/bugwatches/xx-bugwatch-errors.txt (+16/-2) lib/lp/bugs/stories/bugwatches/xx-edit-bugwatch.txt (+123/-0) lib/lp/bugs/templates/bugwatch-editform.pt (+4/-0) lib/lp/bugs/templates/bugwatch-portlet-activity.pt (+44/-0) lib/lp/bugs/tests/test_apportjob.py (+1/-1) lib/lp/bugs/tests/test_bugheat.py (+1/-1) lib/lp/code/configure.zcml (+68/-26) lib/lp/code/doc/branch-merge-proposal-notifications.txt (+11/-5) lib/lp/code/doc/codereviewcomment.txt (+18/-0) lib/lp/code/interfaces/branchmergeproposal.py (+71/-13) lib/lp/code/interfaces/codehosting.py (+12/-0) lib/lp/code/interfaces/codereviewcomment.py (+4/-0) lib/lp/code/mail/branch.py (+11/-12) lib/lp/code/mail/branchmergeproposal.py (+8/-57) lib/lp/code/mail/codereviewcomment.py (+14/-5) lib/lp/code/mail/tests/test_branch.py (+33/-5) lib/lp/code/mail/tests/test_branchmergeproposal.py (+150/-79) lib/lp/code/mail/tests/test_codehandler.py (+22/-26) lib/lp/code/mail/tests/test_codereviewcomment.py (+11/-2) lib/lp/code/model/branchmergeproposal.py (+10/-13) lib/lp/code/model/branchmergeproposaljob.py (+368/-25) lib/lp/code/model/branchtarget.py (+0/-17) lib/lp/code/model/codereviewcomment.py (+8/-0) lib/lp/code/model/tests/test_branchcloud.py (+4/-3) lib/lp/code/model/tests/test_branchmergeproposaljobs.py (+349/-0) lib/lp/code/model/tests/test_branchmergeproposals.py (+30/-248) lib/lp/code/model/tests/test_diff.py (+4/-0) lib/lp/code/scripts/tests/test_create_merge_proposals.py (+3/-3) lib/lp/code/scripts/tests/test_merge_proposal_jobs.py (+9/-47) lib/lp/code/scripts/tests/test_reclaim_branch_space.py (+3/-4) lib/lp/code/scripts/tests/test_scan_branches.py (+2/-2) lib/lp/code/scripts/tests/test_sendbranchmail.py (+13/-8) lib/lp/code/scripts/tests/test_update_preview_diffs.py (+0/-93) lib/lp/code/scripts/tests/test_upgrade_branches.py (+4/-4) lib/lp/code/stories/webservice/xx-code-import.txt (+1/-0) lib/lp/code/subscribers/branchmergeproposal.py (+55/-0) lib/lp/code/tests/helpers.py (+16/-0) lib/lp/code/xmlrpc/codehosting.py (+33/-8) lib/lp/code/xmlrpc/tests/test_codehosting.py (+86/-1) lib/lp/codehosting/inmemory.py (+26/-3) lib/lp/codehosting/scanner/tests/test_bzrsync.py (+6/-5) lib/lp/codehosting/scanner/tests/test_mergedetection.py (+14/-2) lib/lp/codehosting/sftp.py (+2/-5) lib/lp/codehosting/tests/servers.py (+1/-1) lib/lp/codehosting/tests/test_acceptance.py (+108/-114) lib/lp/codehosting/vfs/branchfs.py (+106/-72) lib/lp/codehosting/vfs/branchfsclient.py (+2/-2) lib/lp/codehosting/vfs/tests/test_branchfs.py (+128/-51) lib/lp/codehosting/vfs/tests/test_filesystem.py (+1/-1) lib/lp/hardwaredb/doc/hwdb-submission.txt (+4/-4) lib/lp/registry/doc/distribution-mirror.txt (+5/-5) lib/lp/registry/doc/person-karma.txt (+1/-1) lib/lp/registry/doc/sourceforge-remote-products.txt (+1/-1) lib/lp/registry/doc/standing.txt (+2/-2) lib/lp/services/job/runner.py (+29/-10) lib/lp/services/job/tests/test_runner.py (+6/-2) lib/lp/services/mail/sendmail.py (+27/-24) lib/lp/soyuz/doc/buildd-slavescanner.txt (+2/-2) lib/lp/soyuz/doc/gina.txt (+1/-1) lib/lp/soyuz/doc/manage-chroot.txt (+1/-1) lib/lp/soyuz/doc/package-cache-script.txt (+1/-1) lib/lp/soyuz/scripts/publishdistro.py (+33/-20) lib/lp/soyuz/scripts/tests/test_processupload.py (+1/-1) lib/lp/testing/factory.py (+2/-0) lib/lp/translations/doc/distroseries-translations-copy.txt (+4/-2) lib/lp/translations/doc/fix_translation_credits.txt (+2/-1) lib/lp/translations/doc/poexport-language-pack.txt (+2/-1) lib/lp/translations/doc/poexport-request.txt (+1/-1) lib/lp/translations/doc/pofile-verify-stats.txt (+2/-2) lib/lp/translations/doc/rosetta-poimport-script.txt (+1/-1) lib/lp/translations/doc/sourcepackagerelease-translations.txt (+3/-2) lib/lp/translations/doc/translations-export-to-branch.txt (+1/-1) lib/lp/translations/scripts/tests/test_translations_to_branch.py (+1/-1) scripts/close-account.py (+19/-11) |
To merge this branch: | bzr merge lp://staging/~mwhudson/launchpad/no-hosted-area |
Related bugs: | |
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Penhey (community) | Approve | ||
Review via email:
|
Description of the change
Hi Tim,
This branch makes the ssh codehosting server only use one area (the mirrored area) rather than the mirrored and hosted area.
In addition, on branch unlock, rather than requesting the branch be mirrored, the codehosting server calls a method that updates the fields the puller updates for hosted branches, hopefully reducing latency.
In the next pipe I extend this branchChanged endpoint to also record the branch format.
There's obviously no way this branch can land on its own, it will break many many tests.
Cheers,
mwh
To post a comment you must log in.
lib/lp/ code/xmlrpc/ codehosting. py on_location, last_revision_id): last_mirrored = datetime. datetime. now(pytz. UTC)
in: def branchChanged(self, branch_id, stacked_
+ branch.
should probably be using UTC_NOW
lib/lp/ codehosting/ inmemory. py branchChanged event should use UTC_NOW too.
then: ged_sets_ last_mirrored assertSqlAttrib uteEqualsDate(
test_branchChan
can use:
self.
branch, 'last_mirrored', UTC_NOW)
def test_branchChan ged_doesnt_ create_ scan_job_ for_noop_ change( self):
# XXX Is this even the right thing to do?
It will be with your next pipe.
lib/lp/ codehosting/ vfs/branchfs. py
class LaunchpadServer (I think - around line 558)
the __init__ method still refers to the authserver, also there is a
XXX comment that I'm wondering whether we can remove it or not.
lib/lp/ codehosting/ vfs/tests/ test_branchfs. py - still refers to an
authserver too.
# XXX Maaaybe we could complain on stderr here?
- Not following our XXX format, and is this something we want to do?
# XXX: JonathanLange 2007-05-29: The 'chroot' line lacks a unit test.
I don't suppose you want to add a unit test for this?
General Note: we probably want to rename config. codehosting. mirrored_ branches
at some stage.