Merge lp:~axino/juju-deployer/juju-deployer into lp:juju-deployer

Proposed by Junien Fridrick
Status: Merged
Merged at revision: 215
Proposed branch: lp:~axino/juju-deployer/juju-deployer
Merge into: lp:juju-deployer
Diff against target: 19 lines (+3/-1)
1 file modified
deployer/env/watchers.py (+3/-1)
To merge this branch: bzr merge lp:~axino/juju-deployer/juju-deployer
Reviewer Review Type Date Requested Status
Tim Van Steenburgh (community) Approve
Review via email: mp+343441@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Junien Fridrick (axino) wrote :

On large environment with hundreds of units, update-status hooks can stall
juju-deployer for a long time as it waits for units. So just ignore them.

Revision history for this message
Tim Van Steenburgh (tvansteenburgh) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deployer/env/watchers.py'
2--- deployer/env/watchers.py 2016-07-12 23:43:08 +0000
3+++ deployer/env/watchers.py 2018-04-17 14:28:38 +0000
4@@ -104,12 +104,14 @@
5 # _status_map, just use the original value.
6 err_status = data['workload-status']['current']
7 goal_status = data['agent-status']['current']
8+ message = data['agent-status']['message']
9 goal_status = _status_map.get(goal_status, goal_status)
10 if err_status == 'error':
11 if unit_name not in units_in_error:
12 units_in_error.append(unit_name)
13 new_errors.append(data)
14- elif goal_status != goal_state:
15+ elif goal_status != goal_state and \
16+ message != "running update-status hook":
17 ready = False
18 if new_errors and goal_state != 'removed' and callable(on_errors):
19 on_errors(new_errors)

Subscribers

People subscribed via source and target branches