Ensure node leave intents are handled correctly #510
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
schmichael
approved these changes
May 3, 2018
serf/config.go
Outdated
| @@ -255,6 +262,7 @@ func DefaultConfig() *Config { | |||
| return &Config{ | |||
| NodeName: hostname, | |||
| BroadcastTimeout: 5 * time.Second, | |||
| LeavePropagateDelay: 1 * time.Second, | |||
kyhavlov
approved these changes
May 4, 2018
| @@ -174,6 +174,9 @@ func TestSerf_eventsLeave(t *testing.T) { | |||
| eventCh := make(chan Event, 4) | |||
| s1Config := testConfig() | |||
| s1Config.EventCh = eventCh | |||
| // Make the reap interval longer in this test | |||
| // so that the leave does not also cause a reap | |||
| s1Config.ReapInterval = 30 * time.Second | |||
There was a problem hiding this comment.
Was this hiding the issue with the leave not being propagated in this test?
There was a problem hiding this comment.
Not exactly, default reap interval in the test is too small, and the leave now waits before the method returns so it was causing this test to fail because the left node also got reaped.
armon
reviewed
May 7, 2018
| testMember(t, s1.Members(), s2Config.NodeName, StatusLeft) | ||
| // Verify that s2 is not in the memberlist | ||
| // The join intent is ignored because the leave sleeps long enough for the leave intent to broadcast | ||
| testMember(t, s1.Members(), s2Config.NodeName, StatusNone) |
There was a problem hiding this comment.
@preetapan This doesn't seem right to me. After S2 initiates a leave, it shouldn't disappear as a member until it is reaped. Seems like we expect it to be Left state?
There was a problem hiding this comment.
This was addressed by changing the test setup to increase ReapInterval in #511
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 PR adds a configurable leave timeout to allow leave intent broadcasts to propagate before returning from the Leave method.
It also fixes an edge case in anti entropy sync where a left member in the push/pull message's payload would not get processed because its lamport time was incorrectly set.
Brings in work done in an experimental branch by @slackpad