Manually clear stale imports on jubany - due to failure whilst filing merge proposals

[Max Bowsher]

Similar to bug 789897.

Three imports have apparently failed to upload their results to Launchpad whilst in the middle of filing collision merge proposals.

Owing to Launchpad's restriction on one *active* merge proposal per source and target branches, they are now perpetually failing.

I'm uncertain what should be done to mitigate this in future, but for now we should command the importer to discard the remaining work it is trying to upload to Launchpad, and let it start afresh a new import run.

For this, please run:

for i in kde-l10n-cs kde-l10n-th kde-l10n-uk; do
  sqlite3 meta.db "DELETE FROM commits WHERE package = '$i'"
  ./requeue_package.py "$i"
done

[Max Bowsher (maxb)]

Assigned to ~canonical-bazaar for jubany operations.

[Andrew Bennetts (spiv)]

Done:

pkg_import@jubany:/srv/package-import.canonical.com/new$ for i in kde-l10n-cs kde-l10n-th kde-l10n-uk; do sqlite3 meta.db "DELETE FROM commits WHERE package = '$i'"; (cd scripts; PYTHONPATH=python-debian ./requeue_package.py "$i"); done
Warning: kde-l10n-cs has failed 6 times in the same way
kde-l10n-cs requeued
Warning: kde-l10n-th has failed 8 times in the same way
kde-l10n-th requeued
Warning: kde-l10n-uk has failed 7 times in the same way
kde-l10n-uk requeued

Let's see how they go!

[Andrew Bennetts (spiv)]

These are now failing with:

Traceback (most recent call last):
  File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 1129, in <module>
    persistent_download_cache=options.persistent_download_cache))
  File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 1057, in main
    push_branches_back(package, temp_dir, bstore, possible_transports, local_branches)
  File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 707, in push_branches_back
    overwrite=overwrite)
  File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 401, in push_branch
    br_to = br_from.create_clone_on_transport(to_transport)
  File "/var/lib/python-support/python2.5/bzrlib/branch.py", line 1409, in create_clone_on_transport
    no_tree=no_tree)
  File "/var/lib/python-support/python2.5/bzrlib/bzrdir.py", line 237, in clone_on_transport
    make_working_trees=make_working_trees, shared_repo=want_shared)
  File "/var/lib/python-support/python2.5/bzrlib/bzrdir.py", line 1597, in initialize_on_transport_ex
    make_working_trees=make_working_trees, shared_repo=shared_repo)
  File "/var/lib/python-support/python2.5/bzrlib/bzrdir.py", line 2800, in initialize_on_transport_ex
    stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
  File "/var/lib/python-support/python2.5/bzrlib/bzrdir.py", line 2826, in _initialize_on_transport_ex_rpc
    request_network_name, path, *args)
  File "/var/lib/python-support/python2.5/bzrlib/smart/client.py", line 132, in call
    result, protocol = self.call_expecting_body(method, *args)
  File "/var/lib/python-support/python2.5/bzrlib/smart/client.py", line 145, in call_expecting_body
    method, args, expect_response_body=True)
  File "/var/lib/python-support/python2.5/bzrlib/smart/client.py", line 81, in _call_and_read_response
    expect_body=expect_response_body),
  File "/var/lib/python-support/python2.5/bzrlib/smart/message.py", line 306, in read_response_tuple
    _translate_error(self.args)
  File "/var/lib/python-support/python2.5/bzrlib/smart/message.py", line 357, in _translate_error
    raise errors.FileExists(error_args[0])
bzrlib.errors.FileExists: File exists: '/srv/bazaar.launchpad.net/mirrors/00/04/9a/17'

e.g. lp:~ubuntu/karmic/kde-l10n-th/karmic-backports existed in LP, but was totally empty, not even a .bzr dir.

I tried manually pushing --use-existing-dir from the working dir on jubany and requeuing, and got:

There is already a branch merge proposal registered for branch lp:~ubuntu-branches/ubuntu/hardy/kde-l10n-th/hardy-201106020937 to land on lp:ubuntu/hardy/kde-l10n-th that is still active.
Traceback (most recent call last):
  File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 1129, in <module>
    persistent_download_cache=options.persistent_download_cache))
  File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 1002, in main
    revid_db.cleanup_last_run(cleanup, push_back)
  File "/srv/package-import.canonical.com/new/scripts/icommon.py", line 1209, in cleanup_last_run
    push_cb()
  File "/srv/package-import.canonical.com/new/scripts/import_package.py", line 996,...

[Andrew Bennetts (spiv)]

These 3 packages now seem to be importing successfully. Thanks Max!