Merge lp://staging/~hloeung/ubuntu-repository-cache/metadata-sync-to-peers-less-juju-2 into lp://staging/ubuntu-repository-cache

Proposed by Haw Loeung
Status: Merged
Approved by: Haw Loeung
Approved revision: 400
Merged at revision: 389
Proposed branch: lp://staging/~hloeung/ubuntu-repository-cache/metadata-sync-to-peers-less-juju-2
Merge into: lp://staging/ubuntu-repository-cache
Prerequisite: lp://staging/~hloeung/ubuntu-repository-cache/metadata-sync-to-peers-less-juju
Diff against target: 524 lines (+139/-96)
6 files modified
lib/ubuntu_repository_cache/metadata_cleanup.py (+4/-9)
lib/ubuntu_repository_cache/metadata_peers_sync.py (+51/-38)
lib/ubuntu_repository_cache/metadata_sync.py (+24/-23)
lib/ubuntu_repository_cache/mirror.py (+41/-18)
lib/ubuntu_repository_cache/tests/test_metadata_sync.py (+7/-5)
lib/ubuntu_repository_cache/util.py (+12/-3)
To merge this branch: bzr merge lp://staging/~hloeung/ubuntu-repository-cache/metadata-sync-to-peers-less-juju-2
Reviewer Review Type Date Requested Status
James Simpson Approve
Canonical IS Reviewers Pending
Review via email: mp+428770@code.staging.launchpad.net

Commit message

Move from relying on Juju and juju-run for syncing snapshot metadata to peers

This reduces the chances of an aborted or abnormal termination due to Juju agents dying (shutting down: catacomb 0x... is dying - LP:1984060).

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

396. By Haw Loeung

Fixed log

Revision history for this message
James Simpson (jsimpso) wrote :

Have left some comments, but non-blocking. +1

review: Approve
Revision history for this message
Haw Loeung (hloeung) :
Revision history for this message
Haw Loeung (hloeung) :
Revision history for this message
Haw Loeung (hloeung) :
397. By Haw Loeung

Fix based on review

398. By Haw Loeung

Fix to ensure consistent importing of util per review

399. By Haw Loeung

vendor symlink from charm-helpers to reduce juju-log reliance

400. By Haw Loeung

Only log output if/when there's output

Revision history for this message
James Simpson (jsimpso) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 389

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches