Merge pull request etcd-io#16750 from serathius/roundrobin-3.5

[v3.5] Return to default write scheduler since golang.org/x/[email protected] started using round robin

server/embed/serve.go

@@ -261,8 +261,6 @@ func configureHttpServer(srv *http.Server, cfg config.ServerConfig) error {
 	// todo (ahrtr): should we support configuring other parameters in the future as well?
 	return http2.ConfigureServer(srv, &http2.Server{
 		MaxConcurrentStreams: cfg.MaxConcurrentStreams,
-		// Override to avoid using priority scheduler which is affected by https://github.com/golang/go/issues/58804.
-		NewWriteScheduler: http2.NewRandomWriteScheduler,
 	})
 }
 

tests/e2e/watch_delay_test.go

@@ -61,8 +61,8 @@ var tcs = []testCase{
 	{
 		name:          "TLS",
 		config:        etcdProcessClusterConfig{clusterSize: 1, isClientAutoTLS: true, clientTLS: clientTLS},
-		maxWatchDelay: 3 * time.Second,
-		dbSizeBytes:   500 * Kilo,
+		maxWatchDelay: 150 * time.Millisecond,
+		dbSizeBytes:   5 * Mega,
 	},
 	{
 		name:          "SeparateHttpNoTLS",