Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1216 from philips/improve-cluster-procfile

Browse Source 
etcdserver: stop worrying about scheme
This commit is contained in:
Brandon Philips 2014-09-30 17:13:41 -07:00
commit 6760345453
3 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Procfile
View File

@ -1,5 +1,5 @@
# Use goreman to run `go get github.com/mattn/goreman` # Use goreman to run `go get github.com/mattn/goreman`
etcd1: bin/etcd -name node1 -bind-addr 127.0.0.1:4001 -peer-bind-addr :7001 -bootstrap-config 'node1=localhost:7001,node2=localhost:7002,node3=localhost:7003' etcd1: bin/etcd -name node1 -listen-client-urls http://127.0.0.1:4001 -advertise-client-urls http://127.0.0.1:4001 -listen-peer-urls http://127.0.0.1:7001 -advertise-peer-urls http://127.0.0.1:7001 -bootstrap-config 'node1=http://localhost:7001,node2=http://localhost:7002,node3=http://localhost:7003'
etcd2: bin/etcd -name node2 -bind-addr 127.0.0.1:4002 -peer-bind-addr :7002 -bootstrap-config 'node1=localhost:7001,node2=localhost:7002,node3=localhost:7003' etcd2: bin/etcd -name node2 -listen-client-urls http://127.0.0.1:4002 -advertise-client-urls http://127.0.0.1:4002 -listen-peer-urls http://127.0.0.1:7002 -advertise-peer-urls http://127.0.0.1:7002 -bootstrap-config 'node1=http://localhost:7001,node2=http://localhost:7002,node3=http://localhost:7003'
etcd3: bin/etcd -name node3 -bind-addr 127.0.0.1:4003 -peer-bind-addr :7003 -bootstrap-config 'node1=localhost:7001,node2=localhost:7002,node3=localhost:7003' etcd3: bin/etcd -name node3 -listen-client-urls http://127.0.0.1:4003 -advertise-client-urls http://127.0.0.1:4003 -listen-peer-urls http://127.0.0.1:7003 -advertise-peer-urls http://127.0.0.1:7003 -bootstrap-config 'node1=http://localhost:7001,node2=http://localhost:7002,node3=http://localhost:7003'
#proxy: bin/etcd -proxy=on -bind-addr 127.0.0.1:8080 -peers 'localhost:7001,localhost:7002,localhost:7003' #proxy: bin/etcd -proxy=on -bind-addr 127.0.0.1:8080 -peers 'localhost:7001,localhost:7002,localhost:7003'

6
etcdserver/cluster.go
View File

@ -48,11 +48,11 @@ func (c *Cluster) AddSlice(mems []Member) error {
// an addressible URI. If the given member does not exist, an empty string is returned. // an addressible URI. If the given member does not exist, an empty string is returned.
func (c Cluster) Pick(id int64) string { func (c Cluster) Pick(id int64) string {
if m := c.FindID(id); m != nil { if m := c.FindID(id); m != nil {
addrs := m.PeerURLs urls := m.PeerURLs
if len(addrs) == 0 { if len(urls) == 0 {
return "" return ""
} }
return addrs[rand.Intn(len(addrs))] return urls[rand.Intn(len(urls))]
} }
return "" return ""

17
etcdserver/cluster_store.go
View File

@ -78,25 +78,20 @@ func (s *clusterStore) Delete(id int64) {
func Sender(t *http.Transport, cls ClusterStore) func(msgs []raftpb.Message) { func Sender(t *http.Transport, cls ClusterStore) func(msgs []raftpb.Message) {
c := &http.Client{Transport: t} c := &http.Client{Transport: t}
scheme := "http"
if t.TLSClientConfig != nil {
scheme = "https"
}
return func(msgs []raftpb.Message) { return func(msgs []raftpb.Message) {
for _, m := range msgs { for _, m := range msgs {
// TODO: reuse go routines // TODO: reuse go routines
// limit the number of outgoing connections for the same receiver // limit the number of outgoing connections for the same receiver
go send(c, scheme, cls, m) go send(c, cls, m)
} }
} }
} }
func send(c *http.Client, scheme string, cls ClusterStore, m raftpb.Message) { func send(c *http.Client, cls ClusterStore, m raftpb.Message) {
// TODO (xiangli): reasonable retry logic // TODO (xiangli): reasonable retry logic
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
addr := cls.Get().Pick(m.To) u := cls.Get().Pick(m.To)
if addr == "" { if u == "" {
// TODO: unknown peer id.. what do we do? I // TODO: unknown peer id.. what do we do? I
// don't think his should ever happen, need to // don't think his should ever happen, need to
// look into this further. // look into this further.
@ -104,7 +99,7 @@ func send(c *http.Client, scheme string, cls ClusterStore, m raftpb.Message) {
return return
} }
url := fmt.Sprintf("%s://%s%s", scheme, addr, raftPrefix) u = fmt.Sprintf("%s%s", u, raftPrefix)
// TODO: don't block. we should be able to have 1000s // TODO: don't block. we should be able to have 1000s
// of messages out at a time. // of messages out at a time.
@ -113,7 +108,7 @@ func send(c *http.Client, scheme string, cls ClusterStore, m raftpb.Message) {
log.Println("etcdhttp: dropping message:", err) log.Println("etcdhttp: dropping message:", err)
return // drop bad message return // drop bad message
} }
if httpPost(c, url, data) { if httpPost(c, u, data) {
return // success return // success
} }
// TODO: backoff // TODO: backoff