Add caas operator presence, and status fixes #8357
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
anastasiamac
reviewed
Feb 9, 2018
| }, nil | ||
| } | ||
|
|
||
| if model.Type() == state.ModelTypeIAAS { |
There was a problem hiding this comment.
100% sure that this will work all the time give recent difficulties to figure out what to do on older versions?
(I guess, by the time, this is called upgrades steps would have ensured valid data here?..)
There was a problem hiding this comment.
Right, this should be covered by upgrades. We don't protect this call anywhere.
The recent issue was due to the IAASModel() call which does return an error.
| @@ -181,7 +180,7 @@ func FormatTabular(writer io.Writer, forceColor bool, value interface{}) error { | |||
| } | |||
|
|
|||
| if fs.Model.Type == caasModelType { | |||
| outputHeaders("Unit", "Status", "Address", "Ports", "Message") | |||
| outputHeaders("Unit", "Workload", "Agent", "Address", "Ports", "Message") | |||
state/application.go
Outdated
| } | ||
|
|
||
| // WaitAgentPresence blocks until the respective agent is alive. | ||
| // These should really only be used in the test suite. |
There was a problem hiding this comment.
fixed here and in other places
| return nil | ||
| } | ||
| case <-time.After(timeout): | ||
| // TODO(fwereade): 2016-03-17 lp:1558657 |
anastasiamac
approved these changes
Feb 9, 2018
wallyworld
force-pushed
the
caas-agent-presence
branch
from
66d6e69
to
02da47a
Compare
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of change
A few small CAAS changes:
QA steps
Run up a CAAS model, deploy gitlab
Check that unit status doesn't show "lost"
Check status history
kill-controller and ensure no IAAS model errors