Excise grpc maxConcurrentStreams configuration (letsencrypt#4257)

rolandshoemaker · Daniel McCarney · commit 3532dce246b6 · 2019-06-12T09:35:24.000-04:00
diff --git a/cmd/config.go b/cmd/config.go
@@ -215,12 +215,6 @@ type GRPCServerConfig struct {
 	// (SANs). The server will reject clients that do not present a certificate
 	// with a SAN present on the `ClientNames` list.
 	ClientNames []string `json:"clientNames"`
-	// gRPC multiplexes RPCs across HTTP/2 streams in a single TCP connection.
-	// HTTP/2 servers are allowed to set a limit on the number of streams a client
-	// will create. In Go by default that limit is 250. We can override that for
-	// our servers with this config value. In practice this is a limit on how many
-	// concurrent requests we can handle.
-	MaxConcurrentStreams int
 }
 
 // PortConfig specifies what ports the VA should call to on the remote
diff --git a/grpc/server.go b/grpc/server.go
@@ -46,15 +46,10 @@ func NewServer(c *cmd.GRPCServerConfig, tlsConfig *tls.Config, metrics serverMet
 		return nil, nil, err
 	}
 
-	maxConcurrentStreams := c.MaxConcurrentStreams
-	if maxConcurrentStreams == 0 {
-		maxConcurrentStreams = 250
-	}
 	si := newServerInterceptor(metrics, clk)
 	return grpc.NewServer(
 		grpc.Creds(creds),
 		grpc.UnaryInterceptor(si.intercept),
-		grpc.MaxConcurrentStreams(uint32(maxConcurrentStreams)),
 	), l, nil
 }
 
diff --git a/test/config-next/akamai-purger.json b/test/config-next/akamai-purger.json
@@ -14,7 +14,6 @@
         },
         "grpc": {
           "address": ":9099",
-          "maxConcurrentStreams": 2000,
           "clientNames": [
             "ocsp-updater.boulder",
             "ra.boulder",
diff --git a/test/config-next/ca-a.json b/test/config-next/ca-a.json
@@ -16,7 +16,6 @@
     },
     "grpcCA": {
       "address": ":9093",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "ra.boulder"
       ]
diff --git a/test/config-next/ca-b.json b/test/config-next/ca-b.json
@@ -16,7 +16,6 @@
     },
     "grpcCA": {
       "address": ":9093",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "ra.boulder"
       ]
diff --git a/test/config-next/publisher.json b/test/config-next/publisher.json
@@ -6,7 +6,6 @@
     "debugAddr": ":8009",
     "grpc": {
       "address": ":9091",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "ra.boulder",
         "ocsp-updater.boulder"
diff --git a/test/config-next/ra.json b/test/config-next/ra.json
@@ -39,7 +39,6 @@
     },
     "grpc": {
       "address": ":9094",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "wfe.boulder",
         "admin-revoker.boulder"
diff --git a/test/config-next/sa.json b/test/config-next/sa.json
@@ -12,7 +12,6 @@
     },
     "grpc": {
       "address": ":9095",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "admin-revoker.boulder",
         "ca.boulder",
diff --git a/test/config-next/va-remote-a.json b/test/config-next/va-remote-a.json
@@ -21,7 +21,6 @@
     },
     "grpc": {
       "address": ":9097",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "va.boulder"
       ]
diff --git a/test/config-next/va-remote-b.json b/test/config-next/va-remote-b.json
@@ -21,7 +21,6 @@
     },
     "grpc": {
       "address": ":9098",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "va.boulder"
       ]
diff --git a/test/config-next/va.json b/test/config-next/va.json
@@ -21,7 +21,6 @@
     },
     "grpc": {
       "address": ":9092",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "ra.boulder"
       ]
diff --git a/test/config/akamai-purger.json b/test/config/akamai-purger.json
@@ -14,7 +14,6 @@
         },
         "grpc": {
           "address": ":9099",
-          "maxConcurrentStreams": 2000,
           "clientNames": [
             "ocsp-updater.boulder"
           ]
diff --git a/test/config/ca-a.json b/test/config/ca-a.json
@@ -16,7 +16,6 @@
     },
     "grpcCA": {
       "address": ":9093",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "ra.boulder"
       ]
diff --git a/test/config/ca-b.json b/test/config/ca-b.json
@@ -16,7 +16,6 @@
     },
     "grpcCA": {
       "address": ":9093",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "ra.boulder"
       ]
diff --git a/test/config/publisher.json b/test/config/publisher.json
@@ -5,7 +5,6 @@
     "debugAddr": ":8009",
     "grpc": {
       "address": ":9091",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "ra.boulder",
         "ocsp-updater.boulder"
diff --git a/test/config/ra.json b/test/config/ra.json
@@ -34,7 +34,6 @@
     },
     "grpc": {
       "address": ":9094",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "wfe.boulder",
         "admin-revoker.boulder"
diff --git a/test/config/sa.json b/test/config/sa.json
@@ -12,7 +12,6 @@
     },
     "grpc": {
       "address": ":9095",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "admin-revoker.boulder",
         "ca.boulder",
diff --git a/test/config/va.json b/test/config/va.json
@@ -21,7 +21,6 @@
     },
     "grpc": {
       "address": ":9092",
-      "maxConcurrentStreams": 2000,
       "clientNames": [
         "ra.boulder"
       ]

Original file line number	Diff line number	Diff line change
`@@ -46,15 +46,10 @@ func NewServer(c cmd.GRPCServerConfig, tlsConfig tls.Config, metrics serverMet`
`46`	`46`	`return nil, nil, err`
`47`	`47`	`}`
`48`	`48`
`49`		`- maxConcurrentStreams := c.MaxConcurrentStreams`
`50`		`- if maxConcurrentStreams == 0 {`
`51`		`- maxConcurrentStreams = 250`
`52`		`- }`
`53`	`49`	`si := newServerInterceptor(metrics, clk)`
`54`	`50`	`return grpc.NewServer(`
`55`	`51`	`grpc.Creds(creds),`
`56`	`52`	`grpc.UnaryInterceptor(si.intercept),`
`57`		`- grpc.MaxConcurrentStreams(uint32(maxConcurrentStreams)),`
`58`	`53`	`), l, nil`
`59`	`54`	`}`
`60`	`55`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`	`},`
`17`	`17`	`"grpcCA": {`
`18`	`18`	`"address": ":9093",`
`19`		`- "maxConcurrentStreams": 2000,`
`20`	`19`	`"clientNames": [`
`21`	`20`	`"ra.boulder"`
`22`	`21`	`]`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@`
`21`	`21`	`},`
`22`	`22`	`"grpc": {`
`23`	`23`	`"address": ":9097",`
`24`		`- "maxConcurrentStreams": 2000,`
`25`	`24`	`"clientNames": [`
`26`	`25`	`"va.boulder"`
`27`	`26`	`]`