[swarming] remove conccurentHTTP2 RoundTripper
This is revert of
https://chromium-review.googlesource.com/c/infra/luci/luci-go/+/1343912
We don't need to have this hack in go1.12.
See detail in
https://golang.org/doc/go1.12#net/http
Bug: 868878
Change-Id: I5a23eace6eefca2be1ee6d645a6aa31308b60bb3
Reviewed-on: https://chromium-review.googlesource.com/c/1488591
Auto-Submit: Takuto Ikuta <tikuta@chromium.org>
Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org>
Commit-Queue: Marc-Antoine Ruel <maruel@chromium.org>
diff --git a/client/cmd/swarming/collect.go b/client/cmd/swarming/collect.go
index 8d5dd94..fdb4fda 100644
--- a/client/cmd/swarming/collect.go
+++ b/client/cmd/swarming/collect.go
@@ -20,15 +20,12 @@
"fmt"
"io"
"io/ioutil"
- "math/rand"
- "net/http"
"os"
"regexp"
"sync"
"time"
"github.com/maruel/subcommands"
- "golang.org/x/net/http2"
"go.chromium.org/luci/auth"
"go.chromium.org/luci/client/internal/common"
@@ -199,25 +196,6 @@
return err
}
-// concurentHTTP2 implements http.RoundTripper for highly concurrent http2
-// requests using "https". When we need to do highly parallel http2 request,
-// http2 request may be blocked by maxConcurrentStreams per http2.Transport. To
-// bypass such limitation, conccurentHTTP2 can use several number of
-// http2.Transport.
-// TODO(tikuta): Remove this when crbug.com/825418 is fixed.
-type concurentHTTP2 struct {
- transports []*http2.Transport
-}
-
-func (c concurentHTTP2) RoundTrip(req *http.Request) (*http.Response, error) {
- if req.URL.Scheme == "https" {
- // This is hack to prevent using http2 for localhost.
- return c.transports[rand.Intn(len(c.transports))].RoundTrip(req)
- }
- return http.DefaultTransport.RoundTrip(req)
-
-}
-
func (c *collectRun) Run(a subcommands.Application, args []string, env subcommands.Env) int {
if err := c.Parse(&args); err != nil {
printError(a, err)
@@ -233,17 +211,6 @@
return 1
}
- if c.worker >= 10 {
- // TODO(tikuta): Tune this parameter (c.worker/10) if necessary.
- transports := make([]*http2.Transport, c.worker/10)
- for i := range transports {
- transports[i] = &http2.Transport{}
- }
- c.parsedAuthOpts.Transport = &concurentHTTP2{
- transports: transports,
- }
- }
-
if err := c.main(a, args); err != nil {
printError(a, err)
return 1
