Merge pull request #19041 from ahrtr/serve_20241211

Do not wait for ready notify if the server is stopping
etcd-io · Dec 13, 2024 · 50e97f8 · 50e97f8
2 parents 2cf7172 + 93b01af
commit 50e97f8
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/server/embed/serve.go b/server/embed/serve.go
@@ -16,6 +16,7 @@ package embed
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	defaultLog "log"
@@ -102,6 +103,12 @@ func (sctx *serveCtx) serve(
 	logger := defaultLog.New(io.Discard, "etcdhttp", 0)
 	<-s.ReadyNotify()
 
+	select {
+	case <-s.StoppingNotify():
+		return errors.New("server is stopping")
+	case <-s.ReadyNotify():
+	}
+
 	sctx.lg.Info("ready to serve client requests")
 
 	m := cmux.New(sctx.l)