Fix that felix didn't restart when config was deleted. #1645
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
fasaxc
added a commit
to fasaxc/felix
that referenced
this pull request
Dec 4, 2017
Backports projectcalico#1645, which fixed #1644.
fasaxc
force-pushed
the
fix-config-delete-restart
branch
from
6e14187 to
1abe937
Compare
nelljerram
approved these changes
Dec 4, 2017
| break | ||
| } | ||
| Expect(time.Since(start)).To(BeNumerically("<", time.Second)) | ||
| time.Sleep(50 * time.Millisecond) |
There was a problem hiding this comment.
Logic here doesn't feel quite right to me. Shouldn't it be 'wait until there's 1 Felix PID that is stable for 0.5s' ? As it stands, I think the code can be fooled by seeing a PID of a Felix on the verge of restarting.
There was a problem hiding this comment.
That's OK, I think: we want to get the old PID, then the tests use that to see whether felix restarted or not.
When we call this update method in the new test, it's after waiting for the old PID to disappear.
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
Fixes #1644; needs backport to 2.6.x
Todos
Release Note