github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #105069 from p0lyn0mial/upstream-etcd-client-retry

Browse Source 
etcd client starts retrying transient errors from the etcd cluster
This commit is contained in:
Kubernetes Prow Robot 2021-09-16 12:43:39 -07:00 committed by GitHub
commit 63e7ee43bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go
View File

@ -137,8 +137,13 @@ func newETCD3Client(c storagebackend.TransportConfig) (*clientv3.Client, error)
} }
dialOptions := []grpc.DialOption{ dialOptions := []grpc.DialOption{
grpc.WithBlock(), // block until the underlying connection is up grpc.WithBlock(), // block until the underlying connection is up
grpc.WithUnaryInterceptor(grpcprom.UnaryClientInterceptor), // use chained interceptors so that the default (retry and backoff) interceptors are added.
grpc.WithStreamInterceptor(grpcprom.StreamClientInterceptor), // otherwise they will be overwritten by the metric interceptor.
//
// these optional interceptors will be placed after the default ones.
// which seems to be what we want as the metrics will be collected on each attempt (retry)
grpc.WithChainUnaryInterceptor(grpcprom.UnaryClientInterceptor),
grpc.WithChainStreamInterceptor(grpcprom.StreamClientInterceptor),
} }
if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.APIServerTracing) { if utilfeature.DefaultFeatureGate.Enabled(genericfeatures.APIServerTracing) {
tracingOpts := []otelgrpc.Option{ tracingOpts := []otelgrpc.Option{