Charm Helpers

Merge lp://qastaging/~hopem/charm-helpers/retry-crm-resource-check-if-not-running into lp://qastaging/charm-helpers

retry-crm-resource-check-if-not-running
Merge into devel

Proposed by Edward Hope-Morley on 2014-12-17

Status:

Merged

Merged at revision:

275

Proposed branch:

lp://qastaging/~hopem/charm-helpers/retry-crm-resource-check-if-not-running

Merge into:

lp://qastaging/charm-helpers

Diff against target:

173 lines (+90/-17)

3 files modified

charmhelpers/contrib/hahelpers/cluster.py (+27/-12)
charmhelpers/core/decorators.py (+41/-0)
tests/contrib/hahelpers/test_cluster_utils.py (+22/-5)

To merge this branch:

bzr merge lp://qastaging/~hopem/charm-helpers/retry-crm-resource-check-if-not-running

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Jorge Niedbalski (community)	2014-12-17	Approve on 2014-12-17
OpenStack Charmers	2014-12-17	Pending
James Page	2014-12-17	Pending
Review via email: mp+245023@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2014-12-17.

Revision history for this message

Jorge Niedbalski (niedbalski) wrote on 2014-12-17: Posted in a previous version of this proposal

Nevertheless that corosync resource synchronization should be a pretty quick process, this workaround seems like a good addition for cases in which this is not happening quickly.

- Do you mind to move the nice retry_on_exception method to charmhelpers.core.decorators ?
- I found a minor python 3 issue trying to decode a string. (commented)

Other than that LGTM.

review: Needs Fixing

Revision history for this message

Jorge Niedbalski (niedbalski) wrote on 2014-12-17:

Thanks Edward, I made a small change for fixing the tests , checking if the current status is already a valid text_type, if not it cast to a text_type and encodes it on utf-8.

review: Approve