mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

embed: corrupt-check on restart member

Browse Source 
Signed-off-by: Gyu-Ho Lee <gyuhox@gmail.com>
This commit is contained in:
Gyu-Ho Lee
2017-11-22 12:56:03 -08:00
parent e0dfc4368f
commit 0e4e8ed3d1
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
embed/etcd.go
View File

@ -124,7 +124,9 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
token string token string
) )
memberInitialized := true
if !isMemberInitialized(cfg) { if !isMemberInitialized(cfg) {
memberInitialized = false
urlsmap, token, err = cfg.PeerURLsMapAndToken("etcd") urlsmap, token, err = cfg.PeerURLsMapAndToken("etcd")
if err != nil { if err != nil {
return e, fmt.Errorf("error setting up initial cluster: %v", err) return e, fmt.Errorf("error setting up initial cluster: %v", err)
@ -186,6 +188,16 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
// buffer channel so goroutines on closed connections won't wait forever // buffer channel so goroutines on closed connections won't wait forever
e.errc = make(chan error, len(e.Peers)+len(e.Clients)+2*len(e.sctxs)) e.errc = make(chan error, len(e.Peers)+len(e.Clients)+2*len(e.sctxs))
// newly started member ("memberInitialized==false")
// does not need corruption check
if memberInitialized {
if err = e.Server.CheckInitialHashKV(); err != nil {
// set "EtcdServer" to nil, so that it does not block on "EtcdServer.Close()"
// (nothing to close since rafthttp transports have not been started)
e.Server = nil
return e, err
}
}
e.Server.Start() e.Server.Start()
if err = e.servePeers(); err != nil { if err = e.servePeers(); err != nil {