Merge pull request #19041 from ahrtr/serve_20241211

Do not wait for ready notify if the server is stopping

Author: ahrtr

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)