Juju Charms Collection
ceph-osd package

Merge lp://qastaging/~peter-sabaini/charms/trusty/ceph-osd/ceph-osd-multijournal-next into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next

Proposed by Peter Sabaini on 2015-12-21

Status:

Rejected

Rejected by:

James Page on 2016-01-29

Proposed branch:

lp://qastaging/~peter-sabaini/charms/trusty/ceph-osd/ceph-osd-multijournal-next

Merge into:

lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph-osd/next

Diff against target:

207 lines (+84/-19) (has conflicts)

2 files modified

hooks/ceph.py (+39/-7)
hooks/ceph_hooks.py (+45/-12)

Text conflict in hooks/ceph.py

To merge this branch:

bzr merge lp://qastaging/~peter-sabaini/charms/trusty/ceph-osd/ceph-osd-multijournal-next

Related bugs:

Bug #1495878: ceph-osd charm needs support for multiple journals

High

Fix Released

Remove

Link a bug report

Reviewer	Review Type	Date Requested	Status
James Page		2015-12-21	Needs Fixing on 2016-01-28
Chris Holcombe (community)			Approve on 2016-01-22
Review via email: mp+281149@code.qastaging.launchpad.net

Description of the change

* Handle multiple journals

* Select least-used journal disk instead of blind RR

* Add safeguard for OSD journals

* Avoid zapping journals repeatedly, add check for journal partition type

* Check that journal devices don't overlap with data devices

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-12-21:

#

charm_unit_test #14718 ceph-osd-next for peter-sabaini mp281149
UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/14718/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-12-21:

#

charm_lint_check #15770 ceph-osd-next for peter-sabaini mp281149
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: pastebin not avail., cmd error
Build: http://10.245.162.77:8080/job/charm_lint_check/15770/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2015-12-21:

#

charm_amulet_test #8384 ceph-osd-next for peter-sabaini mp281149
AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8384/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-05:

#

charm_lint_check #16579 ceph-osd-next for peter-sabaini mp281149
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/14407597/
Build: http://10.245.162.77:8080/job/charm_lint_check/16579/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-05:

#

charm_unit_test #15488 ceph-osd-next for peter-sabaini mp281149
UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/15488/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-05:

#

charm_amulet_test #8504 ceph-osd-next for peter-sabaini mp281149
AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/8504/

Revision history for this message

Chris Holcombe (xfactor973) on 2016-01-19:

#

Revision history for this message

Chris Holcombe (xfactor973) wrote on 2016-01-19:

#

If you could just change that write over to being atomic I think this is good to go. I've love to deploy it to aws to test it.

review: Needs Fixing

Revision history for this message

Peter Sabaini (peter-sabaini) wrote on 2016-01-20:

#

Thanks for the review and the suggestion around the atomic write, will update!

Revision history for this message

Chris MacNaughton (chris.macnaughton) wrote on 2016-01-22:

#

Hey Peter, this looks great and I look forward to t hat change! If we want to get this landed for the 16.01 feature freeze, we need that change in soon!

Thanks again!

lp://qastaging/~peter-sabaini/charms/trusty/ceph-osd/ceph-osd-multijournal-next updated on 2016-01-22

56. By Peter Sabaini on 2016-01-22: Make writing the zapfile safer

Revision history for this message

Peter Sabaini (peter-sabaini) wrote on 2016-01-22:

#

Heya Chris+Chris, hope that was what you were looking for?

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_lint_check #17945 ceph-osd-next for peter-sabaini mp281149
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/14598402/
Build: http://10.245.162.77:8080/job/charm_lint_check/17945/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-22:

#

charm_unit_test #16770 ceph-osd-next for peter-sabaini mp281149
UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/16770/

Revision history for this message

Chris Holcombe (xfactor973) wrote on 2016-01-22:

#

Yes that's perfect. Thanks!

review: Approve

Revision history for this message

Chris Holcombe (xfactor973) wrote on 2016-01-28:

#

Peter Sabaini - If you could rebase and take care of that merge conflict we can land this :)

Revision history for this message

James Page (james-page) wrote on 2016-01-28:

#

Note that the lint on the python code also needs resolving:

hooks/ceph_hooks.py:108:1: E302 expected 2 blank lines, found 1
hooks/ceph_hooks.py:118:1: E302 expected 2 blank lines, found 1
hooks/ceph_hooks.py:126:1: E302 expected 2 blank lines, found 1
hooks/ceph_hooks.py:128:80: E501 line too long (85 > 79 characters)
hooks/ceph_hooks.py:133:1: E302 expected 2 blank lines, found 1
hooks/ceph_hooks.py:152:1: E302 expected 2 blank lines, found 1
hooks/ceph_hooks.py:217:1: E302 expected 2 blank lines, found 1
hooks/ceph_hooks.py:225:1: E302 expected 2 blank lines, found 1
hooks/ceph.py:113:44: E261 at least two spaces before inline comment
hooks/ceph.py:114:44: E261 at least two spaces before inline comment
hooks/ceph.py:115:5: E123 closing bracket does not match indentation of opening bracket's line
hooks/ceph.py:117:1: E302 expected 2 blank lines, found 1
hooks/ceph.py:314:1: E302 expected 2 blank lines, found 1
hooks/ceph.py:316:80: E501 line too long (80 > 79 characters)
hooks/ceph.py:322:1: E302 expected 2 blank lines, found 1
hooks/ceph.py:332:1: E302 expected 2 blank lines, found 1
hooks/ceph.py:337:1: E302 expected 2 blank lines, found 1
hooks/ceph.py:356:80: E501 line too long (85 > 79 characters)

Peter - do you have time to make these changes?

review: Needs Fixing

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-28:

#

charm_unit_test #17028 ceph-osd-next for peter-sabaini mp281149
UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/17028/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-28:

#

charm_lint_check #18277 ceph-osd-next for peter-sabaini mp281149
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/14691030/
Build: http://10.245.162.77:8080/job/charm_lint_check/18277/

Revision history for this message

uosci-testing-bot (uosci-testing-bot) wrote on 2016-01-29:

#

charm_amulet_test #9094 ceph-osd-next for peter-sabaini mp281149
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/14692078/
Build: http://10.245.162.77:8080/job/charm_amulet_test/9094/

Revision history for this message

James Page (james-page) wrote on 2016-01-29:

#

In the interests of getting this landed ASAP:

https://code.launchpad.net/~james-page/charms/trusty/ceph-osd/multijournal-fixes

Unmerged revisions

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

to all changes:

Eric Desrochers

Nobuto Murata

OpenStack Charmers

Peter Sabaini