Merge lp://staging/~xfactor973/charms/trusty/ceph-osd/coordinated-upgrade into lp://staging/~openstack-charmers-archive/charms/trusty/ceph-osd/next

Proposed by Chris Holcombe
Status: Needs review
Proposed branch: lp://staging/~xfactor973/charms/trusty/ceph-osd/coordinated-upgrade
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/ceph-osd/next
Diff against target: 600 lines (+387/-18)
5 files modified
.bzrignore (+1/-0)
hooks/ceph.py (+155/-9)
hooks/ceph_hooks.py (+199/-5)
hooks/utils.py (+31/-3)
templates/ceph.conf (+1/-1)
To merge this branch: bzr merge lp://staging/~xfactor973/charms/trusty/ceph-osd/coordinated-upgrade
Reviewer Review Type Date Requested Status
James Page Needs Fixing
Chris MacNaughton Pending
Review via email: mp+287376@code.staging.launchpad.net

Description of the change

This patch allows the ceph osd cluster to upgrade themselves one by one. It does this by using the ceph monitor cluster as a locking mechanism. There are most likely edge cases with this method that I haven't thought of. Consider this code to be lightly tested. It worked fine on ec2.

To post a comment you must log in.
Revision history for this message
Chris Holcombe (xfactor973) wrote :

Note: I put the helpers up for review on charmhelpers: https://code.launchpad.net/~xfactor973/charm-helpers/ceph-keystore/+merge/287205

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #1557 ceph-osd-next for xfactor973 mp287376
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/15210766/
Build: http://10.245.162.36:8080/job/charm_lint_check/1557/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #1305 ceph-osd-next for xfactor973 mp287376
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1305/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #554 ceph-osd-next for xfactor973 mp287376
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15210862/
Build: http://10.245.162.36:8080/job/charm_amulet_test/554/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #1308 ceph-osd-next for xfactor973 mp287376
    UNIT OK: passed

Build: http://10.245.162.36:8080/job/charm_unit_test/1308/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_lint_check #1562 ceph-osd-next for xfactor973 mp287376
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/15210966/
Build: http://10.245.162.36:8080/job/charm_lint_check/1562/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_amulet_test #558 ceph-osd-next for xfactor973 mp287376
    AMULET FAIL: amulet-test failed

AMULET Results (max last 2 lines):
make: *** [functional_test] Error 1
ERROR:root:Make target returned non-zero.

Full amulet test output: http://paste.ubuntu.com/15211124/
Build: http://10.245.162.36:8080/job/charm_amulet_test/558/

Revision history for this message
James Page (james-page) wrote :

I think most of my comments on the ceph-mon proposal also apply here.

review: Needs Fixing
70. By Chris Holcombe

Add back in monitor pieces. Will separate out into another MP

Unmerged revisions

70. By Chris Holcombe

Add back in monitor pieces. Will separate out into another MP

69. By Chris Holcombe

Hash the hostname instead of the ip address. That is more portable. Works now on lxc and also on ec2

68. By Chris Holcombe

Merge upstream

67. By Chris Holcombe

It rolls!. This now upgrades and rolls the ceph osd cluster one by one

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