Show the unit leader in status. #6350
Conversation
| @@ -89,6 +89,7 @@ type UnitStatus struct { | |||
| PublicAddress string `json:"public-address"` | |||
| Charm string `json:"charm"` | |||
| Subordinates map[string]UnitStatus `json:"subordinates"` | |||
| Leader bool `json:"leader"` | |||
There was a problem hiding this comment.
omitempty, to save a few bytes?
There was a problem hiding this comment.
I originally had that and took it off. Will put it back
| @@ -1814,7 +1826,7 @@ var statusTests = []testCase{ | |||
|
|
|||
| // scoped on wordpress/0 | |||
| scopedExpect{ | |||
| "subordinates scoped on logging", | |||
There was a problem hiding this comment.
I think this was correct? The subordinate is scoped to the logging relation of the wordpress application?
There was a problem hiding this comment.
This was a copy/paste error from a previous test. Updated the comment of the test to match the args passed to status, and the comment just before the 'scopedExpect'
| @@ -177,6 +177,9 @@ func FormatTabular(writer io.Writer, forceColor bool, value interface{}) error { | |||
| if agentDoing != "" { | |||
| message = fmt.Sprintf("(%s) %s", agentDoing, message) | |||
| } | |||
| if u.Leader { | |||
There was a problem hiding this comment.
how about we don't display this if there's only one unit? it's noisy/uninteresting in that case.
There was a problem hiding this comment.
There is no nice way to not do this. Discussed on the bug with sabdfl, and agreed that at least for the first cut, we always show it.
|
|
|
Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju |
Addresses http://pad.lv/1620063.
Whether the unit is the leader or not is now returned in the FullStatus. The leader is indicated in tabular output with an * at the end of the unit name. YAML and JSON have a map value called "leader" that is only added when it is true.
The addition of the field into the FullStatus output does not need any facade version bump. It is optional, and the code handles it if it is missing by just not indicating a leader. This has been confirmed by running the new client against an old server.
QA