Merge pull request #16750 from serathius/roundrobin-3.5

[v3.5] Return to default write scheduler since golang.org/x/net@v0.11.0 started using round robin
This commit is contained in:
Marek Siarkowicz 2023-10-12 17:17:14 +02:00 committed by GitHub
commit 9776ceca10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions

View File

@ -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,
})
}

View File

@ -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",