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

discovery: do not return error from etcd

Browse Source 
We used to return `key not found` directly to the
user due to a bug. We fixed the bug and added a test
case in this commit.
This commit is contained in:
Xiang Li 2015-05-11 10:49:49 -07:00
parent 3d242695b3
commit e9931fb8b1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
discovery/discovery.go
View File

@ -183,7 +183,7 @@ func (d *discovery) createSelf(contents string) error {
resp, err := d.c.Create(ctx, d.selfKey(), contents) resp, err := d.c.Create(ctx, d.selfKey(), contents)
cancel() cancel()
if err != nil { if err != nil {
if eerr, ok := err.(*client.Error); ok && eerr.Code == client.ErrorCodeNodeExist { if eerr, ok := err.(client.Error); ok && eerr.Code == client.ErrorCodeNodeExist {
return ErrDuplicateID return ErrDuplicateID
} }
return err return err

3
discovery/discovery_test.go
View File

@ -318,6 +318,7 @@ func TestCreateSelf(t *testing.T) {
c := &clientWithResp{rs: rs, w: w} c := &clientWithResp{rs: rs, w: w}
errc := &clientWithErr{err: errors.New("create err"), w: w} errc := &clientWithErr{err: errors.New("create err"), w: w}
errdupc := &clientWithErr{err: client.Error{Code: client.ErrorCodeNodeExist}}
errwc := &clientWithResp{rs: rs, w: errw} errwc := &clientWithResp{rs: rs, w: errw}
tests := []struct { tests := []struct {
@ -330,6 +331,8 @@ func TestCreateSelf(t *testing.T) {
{errc, errc.err}, {errc, errc.err},
// watcher.next retuens an error // watcher.next retuens an error
{errwc, errw.err}, {errwc, errw.err},
// parse key exist error to duplciate ID error
{errdupc, ErrDuplicateID},
} }
for i, tt := range tests { for i, tt := range tests {