Juju Charms Collection
rabbitmq-server package

Merge lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/lp1485722-pidfile into lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next

  1. Trusty Tahr (14.04)
  2. lp1485722-pidfile
  3. Merge into next
Proposed by Ryan Beisner
Status: Merged
Merged at revision: 106
Proposed branch: lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/lp1485722-pidfile
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/rabbitmq-server/next
Diff against target: 16 lines (+4/-1)
1 file modified
scripts/collect_rabbitmq_stats.sh (+4/-1)
To merge this branch: bzr merge lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/lp1485722-pidfile
Reviewer Review Type Date Requested Status
Billy Olsen Approve
Review via email: mp+269288@code.qastaging.launchpad.net

Description of the change

Address rabbitmq pidfile location differences for Vivid. bug 1485722

Amulet tests in this branch are irrelevant as they only exercise Trusty-Icehouse, they do not exercise nrpe, and they do not accurately test clustering success. There are proposed tests in a pending proposal which also contains the pidfile fixes proposed here. I will link that amulet test result as an indicator that this resolves the issue with Vivid, and preserves existing behavior below Vivid.

I recommend landing this pidfile fix ahead of the amulet-refactor fix.

FYI here is the amulet-refactor branch:
https://code.launchpad.net/~1chb1n/charms/trusty/rabbitmq-server/amulet-refactor-1508/+merge/268811

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

charm_lint_check #8813 rabbitmq-server-next for 1chb1n mp269288
    LINT OK: passed

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

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

charm_unit_test #8141 rabbitmq-server-next for 1chb1n mp269288
    UNIT OK: passed

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

Revision history for this message
Ryan Beisner (1chb1n) wrote :

The WIP branch which has the refactored amulet tests, and which exposed this bug, now passes when pulling this proposed fix into it.

http://paste.ubuntu.com/12203144/
 ==
http://10.245.162.77:8080/view/Dashboards/view/Amulet/job/charm_amulet_test/6041/

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

charm_lint_check #8815 rabbitmq-server-next for 1chb1n mp269288
    LINT OK: passed

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

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

charm_unit_test #8143 rabbitmq-server-next for 1chb1n mp269288
    UNIT OK: passed

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

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

charm_amulet_test #6046 rabbitmq-server-next for 1chb1n mp269288
    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/12203218/
Build: http://10.245.162.77:8080/job/charm_amulet_test/6046/

Revision history for this message
Billy Olsen (billy-olsen) wrote :

See inline comment below

review: Needs Fixing
Revision history for this message
Billy Olsen (billy-olsen) wrote :

Btw the rest of the change looks fine, but the duplicate cat I think would result in incorrectness.

lp://qastaging/~1chb1n/charms/trusty/rabbitmq-server/lp1485722-pidfile updated
107. By Ryan Beisner

remove a cat

Revision history for this message
Billy Olsen (billy-olsen) wrote :

Looks good to me Ryan, thanks for fixing it up and finding the root cause here!

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