Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(standby_server): able to join the cluster containing itself #818

Merged
merged 2 commits into from
May 31, 2014

Conversation

yichengq
Copy link
Contributor

Standby server will switch to peer server if it finds that
it has been contained in the cluster.

fixes #815
fixes #810

Standby server will switch to peer server if it finds that
it has been contained in the cluster.
@yichengq
Copy link
Contributor Author

@xiangli-cmu @philips This is a bug fix. Plz review.

// Wait for a monitor cycle before checking for removal.
time.Sleep(server.ActiveMonitorTimeout + (1 * time.Second))

// Verify that we now have four peers.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this comment does not match the code.

@philips
Copy link
Contributor

philips commented May 30, 2014

lgtm

yichengq added a commit that referenced this pull request May 31, 2014
fix(standby_server): able to join the cluster containing itself
@yichengq yichengq merged commit f007cf3 into etcd-io:master May 31, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

vote endpoint returns 404 on new cluster standby_info interferes with cluster recovery
2 participants