vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2809 from xiang90/fix_discovery_err 

discovery: do not return raw error from etcd store
release-2.1
Xiang Li 2015-05-12 09:59:56 -07:00
parent b764f07e34 91cbf47a2a
commit 93b610ac8d
3 changed files with 8 additions and 3 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)
cancel()
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 err

3
discovery/discovery_test.go
View File

@ -318,6 +318,7 @@ func TestCreateSelf(t *testing.T) {
c := &clientWithResp{rs: rs, 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}
tests := []struct {
@ -330,6 +331,8 @@ func TestCreateSelf(t *testing.T) {
{errc, errc.err},
// watcher.next retuens an error
{errwc, errw.err},
// parse key exist error to duplciate ID error
{errdupc, ErrDuplicateID},
}
for i, tt := range tests {

6
etcdmain/etcd.go
View File

@ -99,8 +99,10 @@ func Main() {
if err != nil {
switch err {
case discovery.ErrDuplicateID:
log.Fatalf("member %s has previously registered with discovery service (%s), but the data-dir (%s) on disk cannot be found.",
cfg.name, cfg.durl, cfg.dir)
log.Printf("member %q has previously registered with discovery service token (%s).", cfg.name, cfg.durl)
log.Printf("But etcd could not find vaild cluster configuration in the given data dir (%s).", cfg.dir)
log.Printf("Please check the given data dir path if the previous bootstrap succeeded")
log.Printf("or use a new discovery token if the previous bootstrap failed.")
default:
log.Fatalf("%v", err)
}