2.6 fix intermittent login failure #10463
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
…indicate initialization.
|
Address already in use !!build!! |
timClicks
reviewed
Jul 25, 2019
| @@ -29,8 +29,14 @@ type BackingWatcher interface { | |||
| Stop() error | |||
| } | |||
|
|
|||
| // Unlocker is used to indicate that the model cache is ready to be used. | |||
| type Unlocker interface { | |||
| Unlock() | |||
timClicks
reviewed
Jul 26, 2019
| // Config describes the necessary fields for NewWorker. | ||
| type Config struct { | ||
| InitializedGate Unlocker |
There was a problem hiding this comment.
Will tend to stutter as variables are called gate.
There was a problem hiding this comment.
Actually none of the variables are called gate. But initialized or unlocker. The later of which is a bit odd IMO.
jameinel
approved these changes
Jul 31, 2019
juju/testing/conn.go
Outdated
| // want to do things with those models where the actions may touch | ||
| // the model cache. | ||
| func (s *JujuConnSuite) EnsureCachedModel(c *gc.C, uuid string) { | ||
| start := time.Now() |
There was a problem hiding this comment.
Is this clearer as a
stop := time.After(testing.LongWait)
retry := time.After(0)
for {
select {
case <-retry:
_, err := s.Controller.Model(uuid)
if err == nil {
return
}
timeout = time.After(testing.ShortWait)
case <-stop:
c.Errorf("model %v not seen in cache after %v", uuid, testing.LongWait)
return
}
}
There was a problem hiding this comment.
Yes, I think something with a select is better.
|
|
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.
This branch fixes two different intermittent failures due to the model not being found in the model cache.
This happens when the apiserver code is creating the facade context.
The fix is to ensure that the model exists in the cache before continuing with the test. A helper method has been added to the JujuConnSuite as this is the one that triggers it most.
Additionally the apiserver is now not created in the engine until the model cache has been initialized. This will help avoid login issues to the apiserver if there are many models.
QA steps
Documentation changes
No user facing impact.