Skip to content
This repository has been archived by the owner on Feb 18, 2021. It is now read-only.

upgrade ringpop to latest #283

Merged
merged 2 commits into from
Aug 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/rp_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func NewTestRingpopCluster(name string, size int, ipAddr string, seed string, sN
cluster.hostUUIDs[i] = uuid.New()
cluster.hostAddrs[i] = cluster.channels[i].PeerInfo().HostPort
cluster.hostInfoList[i] = HostInfo{UUID: cluster.hostUUIDs[i], Addr: cluster.hostAddrs[i]}
cluster.rings[i], _ = ringpop.New(name, ringpop.Channel(cluster.channels[i]), ringpop.Identity(cluster.hostAddrs[i]))
cluster.rings[i], err = ringpop.New(name, ringpop.Channel(cluster.channels[i]), ringpop.Address(cluster.hostAddrs[i]))
}

// if seed node is already supplied, use it; if not, set it
Expand Down
2 changes: 1 addition & 1 deletion common/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func buildRingpopHosts(ipaddr string, port int) []string {

// CreateRingpop instantiates the ringpop for the provided channel and host,
func CreateRingpop(service string, ch *tchannel.Channel, ipaddr string, port int) *(ringpop.Ringpop) {
rp, _ := ringpop.New(fmt.Sprintf("%s", rpAppNamePrefix), ringpop.Channel(ch), ringpop.Identity(fmt.Sprintf("%s:%d", ipaddr, port)))
rp, _ := ringpop.New(fmt.Sprintf("%s", rpAppNamePrefix), ringpop.Channel(ch), ringpop.Address(fmt.Sprintf("%s:%d", ipaddr, port)))

return rp
}
Expand Down
35 changes: 18 additions & 17 deletions glide.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,14 @@ import:
- package: github.com/cockroachdb/c-rocksdb
version: 09d6d520b61160d194c06768ed85415cd8abee57
- package: github.com/uber-common/bark
version: fix-logrus-8841a0f
- package: github.com/uber/cherami-client-go
version: =2.3.0
subpackages:
- client/cherami
- common
- common/backoff
- common/websocket
- stream
- package: github.com/uber/cherami-thrift
version: v1.24.0-rc0
subpackages:
- .generated/go/admin
- .generated/go/cherami
Expand All @@ -51,7 +48,6 @@ import:
- .generated/go/shared
- .generated/go/store
- package: github.com/uber/ringpop-go
version: v0.7.0.fix.sirupsen
subpackages:
- discovery
- discovery/statichosts
Expand Down