Merge lp://qastaging/~chris.macnaughton/charms/trusty/ceph/pause-resume into lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/next

Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 135
Proposed branch: lp://qastaging/~chris.macnaughton/charms/trusty/ceph/pause-resume
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/ceph/next
Diff against target: 101 lines (+45/-0)
6 files modified
README.md (+6/-0)
actions.yaml (+4/-0)
actions/pause-health (+6/-0)
actions/resume-health (+6/-0)
tests/basic_deployment.py (+22/-0)
tests/tests.yaml (+1/-0)
To merge this branch: bzr merge lp://qastaging/~chris.macnaughton/charms/trusty/ceph/pause-resume
Reviewer Review Type Date Requested Status
Chris Holcombe (community) Approve
Chris MacNaughton (community) Needs Resubmitting
James Page Needs Information
Review via email: mp+282645@code.qastaging.launchpad.net

Description of the change

Adds actions to pause or resume OSD health functions, for example removing OSDs that disappear.

To post a comment you must log in.
Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote :

charm_unit_test #16186 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

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

charm_lint_check #17327 ceph-next for chris.macnaughton mp282645
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17327/

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

charm_amulet_test #8783 ceph-next for chris.macnaughton mp282645
    AMULET OK: passed

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

129. By Chris MacNaughton

updating tests

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

charm_lint_check #17401 ceph-next for chris.macnaughton mp282645
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17401/

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

charm_unit_test #16256 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

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

charm_amulet_test #8811 ceph-next for chris.macnaughton mp282645
    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/14511420/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8811/

130. By Chris MacNaughton

fix version

131. By Chris MacNaughton

update tests.yaml

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

charm_lint_check #17937 ceph-next for chris.macnaughton mp282645
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17937/

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

charm_unit_test #16762 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

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

charm_amulet_test #8960 ceph-next for chris.macnaughton mp282645
    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/14597563/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8960/

132. By Chris MacNaughton

update to use correct(?) commands

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

charm_unit_test #16769 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

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

charm_lint_check #17946 ceph-next for chris.macnaughton mp282645
    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/14598404/
Build: http://10.245.162.77:8080/job/charm_lint_check/17946/

133. By Chris MacNaughton

fix variable name

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

charm_unit_test #16771 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

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

charm_lint_check #17947 ceph-next for chris.macnaughton mp282645
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17947/

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

charm_amulet_test #8970 ceph-next for chris.macnaughton mp282645
    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/14599524/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8970/

134. By Chris MacNaughton

try with sleeping

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

charm_unit_test #16776 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

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

charm_lint_check #17953 ceph-next for chris.macnaughton mp282645
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17953/

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

charm_amulet_test #8975 ceph-next for chris.macnaughton mp282645
    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/14600223/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8975/

135. By Chris MacNaughton

modify regex to not care about order

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

charm_lint_check #17955 ceph-next for chris.macnaughton mp282645
    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/14600324/
Build: http://10.245.162.77:8080/job/charm_lint_check/17955/

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

charm_unit_test #16777 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

136. By Chris MacNaughton

fix line length

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

charm_unit_test #16778 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

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

charm_lint_check #17956 ceph-next for chris.macnaughton mp282645
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17956/

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

charm_amulet_test #8977 ceph-next for chris.macnaughton mp282645
    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/14600873/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8977/

137. By Chris MacNaughton

use search instead of match

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

charm_lint_check #17957 ceph-next for chris.macnaughton mp282645
    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/14600969/
Build: http://10.245.162.77:8080/job/charm_lint_check/17957/

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

charm_unit_test #16779 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

138. By Chris MacNaughton

lint fix

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

charm_amulet_test #8978 ceph-next for chris.macnaughton mp282645
    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/14601168/
Build: http://10.245.162.77:8080/job/charm_amulet_test/8978/

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

charm_unit_test #16780 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

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

charm_lint_check #17958 ceph-next for chris.macnaughton mp282645
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17958/

139. By Chris MacNaughton

remove regex

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

charm_lint_check #17959 ceph-next for chris.macnaughton mp282645
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/17959/

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

charm_unit_test #16781 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

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

charm_amulet_test #8983 ceph-next for chris.macnaughton mp282645
    AMULET OK: passed

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

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

Do the actions apply to all osd's in the ceph cluster, or just the ones on the local unit?

pause/resume is being used in other charms, but only has unit level scope - so lets make sure things are lining up from an experience perspective.

review: Needs Information
Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

This is why I was saying we need to discuss this; these actions are globally scoped to the ceph cluster, rather than to a single host or OSD. I think that we probably do want to have these actions available, I'm just not sure if we want to name them something else, pause/resume_health maybe?

140. By Chris MacNaughton

rename actions

Revision history for this message
Chris MacNaughton (chris.macnaughton) wrote :

Has renamed actions to be more clear about what they are doing, will work on Open Stack standard pause/resume actions in a separate MP

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

charm_lint_check #377 ceph-next for chris.macnaughton mp282645
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/377/

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

charm_unit_test #300 ceph-next for chris.macnaughton mp282645
    UNIT OK: passed

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

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

charm_amulet_test #151 ceph-next for chris.macnaughton mp282645
    AMULET OK: passed

Build: http://10.245.162.36:8080/job/charm_amulet_test/151/

Revision history for this message
Chris Holcombe (xfactor973) wrote :

+1 Land it!

review: Approve

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