etcdmain: handle StopNotify when ErrStopped aborted publish

Fix #7512. If a server starts and aborts due to config error, it is possible to get stuck in ReadyNotify waits. This adds select case to get notified on stop channel. Signed-off-by: Gyu-Ho Lee <[email protected]>
etcd-io · Mar 20, 2017 · 543800a · 543800a
1 parent 3a1368d
commit 543800a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
@@ -189,7 +189,11 @@ func startEtcd(cfg *embed.Config) (<-chan struct{}, <-chan error, error) {
 		return nil, nil, err
 	}
 	osutil.RegisterInterruptHandler(e.Server.Stop)
-	<-e.Server.ReadyNotify() // wait for e.Server to join the cluster
+	select {
+	case <-e.Server.ReadyNotify(): // wait for e.Server to join the cluster
+	case <-e.Server.StopNotify(): // publish aborted from 'ErrStopped'
+		e.Server.HardStop()
+	}
 	return e.Server.StopNotify(), e.Err(), nil
 }