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

fix retry to not retry on createSelf()

Browse Source
This commit is contained in:
Barak Michener 2014-10-07 21:20:45 -04:00
parent ca1bbee737
commit f3870598b9
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
discovery/discovery.go
View File

@ -23,7 +23,9 @@ var (
ErrDuplicateID = errors.New("discovery: found duplicate id") ErrDuplicateID = errors.New("discovery: found duplicate id")
ErrFullCluster = errors.New("discovery: cluster is full") ErrFullCluster = errors.New("discovery: cluster is full")
ErrTooManyRetries = errors.New("discovery: too many retries") ErrTooManyRetries = errors.New("discovery: too many retries")
)
const (
// Number of retries discovery will attempt before giving up and erroring out. // Number of retries discovery will attempt before giving up and erroring out.
nRetries = uint(3) nRetries = uint(3)
) )
@ -73,12 +75,9 @@ func (d *discovery) Discover() (string, error) {
} }
if err := d.createSelf(); err != nil { if err := d.createSelf(); err != nil {
if err == client.ErrTimeout { // Fails, even on a timeout, if createSelf times out.
if d.retries < nRetries { // TODO(barakmich): Retrying the same node might want to succeed here
d.logAndBackoffForRetry("registering self") // (ie, createSelf should be idempotent for discovery).
return d.Discover()
}
}
return "", err return "", err
} }
@ -89,15 +88,6 @@ func (d *discovery) Discover() (string, error) {
all, err := d.waitNodes(nodes, size) all, err := d.waitNodes(nodes, size)
if err != nil { if err != nil {
if err == client.ErrTimeout {
// Our actual connection timed out (nodes can take awhile, but the discovery
// server stopped responding) increment our retry counter and we have to
// start from scratch. Calling createSelf() again should be idempotent.
if d.retries < nRetries {
d.logAndBackoffForRetry("waiting for other nodes")
return d.Discover()
}
}
return "", err return "", err
} }
@ -179,6 +169,18 @@ func (d *discovery) checkClusterRetry() (client.Nodes, int, error) {
return nil, 0, ErrTooManyRetries return nil, 0, ErrTooManyRetries
} }
func (d *discovery) waitNodesRetry() (client.Nodes, error) {
if d.retries < nRetries {
d.logAndBackoffForRetry("waiting for other nodes")
nodes, n, err := d.checkCluster()
if err != nil {
return nil, err
}
return d.waitNodes(nodes, n)
}
return nil, ErrTooManyRetries
}
func (d *discovery) waitNodes(nodes client.Nodes, size int) (client.Nodes, error) { func (d *discovery) waitNodes(nodes client.Nodes, size int) (client.Nodes, error) {
if len(nodes) > size { if len(nodes) > size {
nodes = nodes[:size] nodes = nodes[:size]
@ -190,6 +192,9 @@ func (d *discovery) waitNodes(nodes client.Nodes, size int) (client.Nodes, error
for len(all) < size { for len(all) < size {
resp, err := w.Next() resp, err := w.Next()
if err != nil { if err != nil {
if err == client.ErrTimeout {
return d.waitNodesRetry()
}
return nil, err return nil, err
} }
all = append(all, resp.Node) all = append(all, resp.Node)