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 #6289 from purpleidea/feat/move-readynotify

Browse Source 
embed: Move the ReadyNotify() call to a more sane place
This commit is contained in:
Xiang Li 2016-08-29 20:06:17 -07:00 committed by GitHub
commit 9e9bbb829e
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
embed/doc.go
View File

@ -19,6 +19,7 @@ Launch an embedded etcd server using the configuration defaults:
import ( import (
"log" "log"
"time"
"github.com/coreos/etcd/embed" "github.com/coreos/etcd/embed"
) )
@ -31,6 +32,13 @@ Launch an embedded etcd server using the configuration defaults:
log.Fatal(err) log.Fatal(err)
} }
defer e.Close() defer e.Close()
select {
case <-e.Server.ReadyNotify():
log.Printf("Server is ready!")
case <-time.After(60 * time.Second):
e.Server.Stop() // trigger a shutdown
log.Printf("Server took too long to start!")
}
log.Fatal(<-e.Err()) log.Fatal(<-e.Err())
} }
*/ */

3
embed/etcd.go
View File

@ -59,6 +59,8 @@ type Etcd struct {
} }
// StartEtcd launches the etcd server and HTTP handlers for client/server communication. // StartEtcd launches the etcd server and HTTP handlers for client/server communication.
// The returned Etcd.Server is not guaranteed to have joined the cluster. Wait
// on the Etcd.Server.ReadyNotify() channel to know when it completes and is ready for use.
func StartEtcd(inCfg *Config) (e *Etcd, err error) { func StartEtcd(inCfg *Config) (e *Etcd, err error) {
if err = inCfg.Validate(); err != nil { if err = inCfg.Validate(); err != nil {
return nil, err return nil, err
@ -130,7 +132,6 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
if err = e.serve(); err != nil { if err = e.serve(); err != nil {
return return
} }
<-e.Server.ReadyNotify()
return return
} }

1
etcdmain/etcd.go
View File

@ -202,6 +202,7 @@ func startEtcd(cfg *embed.Config) (<-chan struct{}, <-chan error, error) {
return nil, nil, err return nil, nil, err
} }
osutil.RegisterInterruptHandler(e.Server.Stop) osutil.RegisterInterruptHandler(e.Server.Stop)
<-e.Server.ReadyNotify() // wait for e.Server to join the cluster
return e.Server.StopNotify(), e.Err(), nil return e.Server.StopNotify(), e.Err(), nil
} }

3
integration/embed_test.go
View File

@ -65,6 +65,9 @@ func TestEmbedEtcd(t *testing.T) {
for i, tt := range tests { for i, tt := range tests {
tests[i].cfg.Dir = dir tests[i].cfg.Dir = dir
e, err := embed.StartEtcd(&tests[i].cfg) e, err := embed.StartEtcd(&tests[i].cfg)
if e != nil {
<-e.Server.ReadyNotify() // wait for e.Server to join the cluster
}
if tt.werr != "" { if tt.werr != "" {
if err == nil || !strings.Contains(err.Error(), tt.werr) { if err == nil || !strings.Contains(err.Error(), tt.werr) {
t.Errorf("%d: expected error with %q, got %v", i, tt.werr, err) t.Errorf("%d: expected error with %q, got %v", i, tt.werr, err)