Fix/1160 fix clustering #1437
Merged
Fix/1160 fix clustering #1437
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
|
@asknaskan it seems like there are unresolved conflicts |
added 2 commits
July 25, 2016 21:23
# Conflicts: # kong/cli/services/serf.lua
|
@thefosk Well, I noticed a bit late I'm being at master code base. I created something similar on the next code base. The next branch version is not working at the vagrant kong, so I have to wait for checks - But it should fit. |
|
Look's like there is a lot of stuff broken at the moment, so the checks failed. I'm not be able to start an kong on next branch (docker) at the moment. If you want to, please try to test it. |
| @@ -92,6 +92,9 @@ function _M.start(kong_config, dao) | |||
| return nil, "could not start Serf: "..err | |||
| end | |||
|
|
|||
| -- cleanup current node from cluster to prevent inconsistency of data | |||
| serf:cleanup() | |||
There was a problem hiding this comment.
@asknaskan can you please check for errors here?
local ok, err = serf:cleanup()
if not ok then return nil, err end
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.
Summary
I just changed the position of inconsistency check from clustering to prevent that an node removes itself if it failed to cluster.
Instead of checking it when joining an cluster, I now check it when starting the node.
Full changelog
Issues resolved
Fix #1160