Skip to content

Integrates Consul with "stage one" of HashiCorp Raft library v2. - #2222

Merged
slackpad merged 12 commits into
masterfrom
f-raft-v2
Aug 9, 2016
Merged

slackpad merged 12 commits into
masterfrom
f-raft-v2

Conversation

@slackpad

Copy link
Copy Markdown
Contributor

This isn't ready to merge until we do the proper vendoring but the integration part is ready for review. All unit tests are passing locally and I've booted a test cluster with this :-)

@slackpad
slackpad force-pushed the f-raft-v2 branch 4 times, most recently from 660adb8 to 8dd1207 Compare August 1, 2016 22:04
@slackpad

slackpad commented Aug 1, 2016

Copy link
Copy Markdown
Contributor Author

The dependent changes have been pulled into the https://github.com/hashicorp/raft/tree/library-v2-stage-one branch over in Raft, which will serve as our stable branch for Consul as other Raft refactoring takes place. These changes are now vendored so this is ready for review.

@slackpad slackpad changed the title Integrates Consul with new version of Raft library. Integrates Consul with "stage one" of HashiCorp Raft library v2. Aug 5, 2016
@slackpad

slackpad commented Aug 9, 2016

Copy link
Copy Markdown
Contributor Author

Switched to govendor so rebase incoming to fix up the metadata.

Comment thread consul/serf.go Outdated
if err := s.raft.SetPeers(addrs).Error(); err != nil {
s.logger.Printf("[ERR] consul: failed to bootstrap peers: %v", err)
// Attempt a live bootstrap!
s.logger.Printf("[INFO] consul: found expected number of peers, attempting to bootstrap cluster...")

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think its useful to have it log the IPs it is attempting to bootstrap with as a sanity check

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Good call - I'll add them to this log message.

@slackpad
slackpad merged commit 66dcefc into master Aug 9, 2016
@slackpad
slackpad deleted the f-raft-v2 branch August 9, 2016 23:04
@dadgar

dadgar commented Aug 12, 2016

Copy link
Copy Markdown
Contributor

LGTM

supHTI pushed a commit to supHTI/consul that referenced this pull request Sep 1, 2026
Integrates Consul with "stage one" of HashiCorp Raft library v2.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants