Juju Charms Collection
swift-storage package

Merge lp:~james-page/charms/trusty/swift-storage/lp1318083-next into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

  1. Trusty Tahr (14.04)
  2. lp1318083-next
  3. Merge into next
Proposed by James Page
Status: Merged
Merged at revision: 40
Proposed branch: lp:~james-page/charms/trusty/swift-storage/lp1318083-next
Merge into: lp:~openstack-charmers-archive/charms/trusty/swift-storage/next
Diff against target: 11 lines (+2/-1)
1 file modified
hooks/swift_storage_utils.py (+2/-1)
To merge this branch: bzr merge lp:~james-page/charms/trusty/swift-storage/lp1318083-next
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+230263@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) wrote :

This points to a wider problem that swift ring configuration is currently eventually consistent; we should really look to use something better for ring management going forward which does transactional, incremental updates to ring files (swift-ringmaster might be an option).

Revision history for this message
Liam Young (gnuoy) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/swift_storage_utils.py'
2--- hooks/swift_storage_utils.py 2014-08-04 12:24:00 +0000
3+++ hooks/swift_storage_utils.py 2014-08-11 09:22:21 +0000
4@@ -198,7 +198,8 @@
5 for server in ['account', 'object', 'container']:
6 url = '%s/%s.ring.gz' % (rings_url, server)
7 log('Fetching %s.' % url)
8- cmd = ['wget', url, '-O', '/etc/swift/%s.ring.gz' % server]
9+ cmd = ['wget', url, '--retry-connrefused',
10+ '-t', '10', '-O', '/etc/swift/%s.ring.gz' % server]
11 check_call(cmd)
12
13

Subscribers

People subscribed via source and target branches