Merge lp://staging/~adam-collard/charms/trusty/swift-storage/guard-paused-unit-service-restarts into lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/next

Proposed by Adam Collard
Status: Merged
Merged at revision: 80
Proposed branch: lp://staging/~adam-collard/charms/trusty/swift-storage/guard-paused-unit-service-restarts
Merge into: lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/next
Prerequisite: lp://staging/~adam-collard/charms/trusty/swift-storage/fix-unconditional-service-restart
Diff against target: 158 lines (+75/-5)
4 files modified
hooks/swift_storage_hooks.py (+5/-3)
lib/misc_utils.py (+18/-0)
lib/swift_storage_utils.py (+4/-2)
tests/basic_deployment.py (+48/-0)
To merge this branch: bzr merge lp://staging/~adam-collard/charms/trusty/swift-storage/guard-paused-unit-service-restarts
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Alberto Donato (community) Approve
Review via email: mp+269860@code.staging.launchpad.net

This proposal supersedes a proposal from 2015-08-28.

Description of the change

This is a follow up branch to https://code.launchpad.net/~adam-collard/charms/trusty/swift-storage/add-pause-resume-actions/+merge/268233 to prevent config-changed from blindly (re)starting services when the unit is paused.

Normal flow is pause(), (optionally) change config -> changes should be persisted on disk, but nothing started. resume() -> services started.

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

charm_lint_check #8938 swift-storage-next for adam-collard mp269528
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_unit_test #8258 swift-storage-next for adam-collard mp269528
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_amulet_test #6082 swift-storage-next for adam-collard mp269528
    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/12215822/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6082/

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_lint_check #8939 swift-storage-next for adam-collard mp269528
    LINT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_unit_test #8259 swift-storage-next for adam-collard mp269528
    UNIT OK: passed

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

Revision history for this message
uosci-testing-bot (uosci-testing-bot) wrote : Posted in a previous version of this proposal

charm_amulet_test #6083 swift-storage-next for adam-collard mp269528
    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/12216361/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6083/

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

charm_lint_check #9227 swift-storage-next for adam-collard mp269860
    LINT OK: passed

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

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

charm_unit_test #8528 swift-storage-next for adam-collard mp269860
    UNIT OK: passed

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

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

charm_amulet_test #6189 swift-storage-next for adam-collard mp269860
    AMULET OK: passed

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

Revision history for this message
Alberto Donato (ack) wrote :

Looks good, +1

one minor comment inline.

review: Approve
97. By Adam Collard

Expand list-comp to full for-loop, use SWIFT_SVCS instead of ACCOUNT + CONTAINER + OBJECT (ack's review)

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

charm_unit_test #8531 swift-storage-next for adam-collard mp269860
    UNIT OK: passed

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

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

charm_lint_check #9230 swift-storage-next for adam-collard mp269860
    LINT OK: passed

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

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

charm_amulet_test #6192 swift-storage-next for adam-collard mp269860
    AMULET OK: passed

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

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

Approve

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