Merge branch 'master' of ssh://github.com/buildbuddy-io/buildbuddy

buildbuddy-io · Sep 30, 2021 · ab37886 · ab37886
2 parents 260c90a + e4c90c6
commit ab37886
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/enterprise/server/cmd/server/main.go b/enterprise/server/cmd/server/main.go
@@ -194,7 +194,7 @@ func main() {
 		redisClient := redisutil.NewClient(redisTarget, healthChecker, "default_redis")
 		realEnv.SetDefaultRedisClient(redisClient)
 		r := redis_cache.NewCache(realEnv.GetDefaultRedisClient(), 0)
-		realEnv.SetMetricsCollector(r)
+		// realEnv.SetMetricsCollector(r)
 		realEnv.SetKeyValStore(r)
 	}
 

diff --git a/server/util/grpc_server/BUILD b/server/util/grpc_server/BUILD
@@ -15,5 +15,6 @@ go_library(
         "@io_opentelemetry_go_otel//attribute",
         "@io_opentelemetry_go_otel_trace//:trace",
         "@org_golang_google_grpc//:go_default_library",
+        "@org_golang_google_grpc//keepalive",
     ],
 )
diff --git a/server/util/grpc_server/grpc_server.go b/server/util/grpc_server/grpc_server.go
@@ -12,6 +12,7 @@ import (
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 	"google.golang.org/grpc"
+	"google.golang.org/grpc/keepalive"
 
 	grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
 )
@@ -82,5 +83,10 @@ func CommonGRPCServerOptions(env environment.Env) []grpc.ServerOption {
 		grpc.StreamInterceptor(grpc_prometheus.StreamServerInterceptor),
 		grpc.UnaryInterceptor(grpc_prometheus.UnaryServerInterceptor),
 		grpc.MaxRecvMsgSize(env.GetConfigurator().GetGRPCMaxRecvMsgSizeBytes()),
+		// Set to avoid errors: Bandwidth exhausted HTTP/2 error code: ENHANCE_YOUR_CALM Received Goaway too_many_pings
+		grpc.KeepaliveEnforcementPolicy(keepalive.EnforcementPolicy{
+			MinTime:             10 * time.Second, // If a client pings more than once every 10 seconds, terminate the connection
+			PermitWithoutStream: true,             // Allow pings even when there are no active streams
+		}),
 	}
 }