Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

grpc client: wait properly for establishing a connection #3938

Merged
merged 1 commit into from
Nov 30, 2022
Merged

grpc client: wait properly for establishing a connection #3938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 apis/keda/v1alpha1/indentifier.go → apis/keda/v1alpha1/identifier.go
View file
Open in desktop
File renamed without changes.
31 changes: 29 additions & 2 deletions pkg/metricsservice/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ package metricsservice
import (
"context"
"fmt"
"time"

"github.com/go-logr/logr"
"google.golang.org/grpc"
"google.golang.org/grpc/connectivity"
"google.golang.org/grpc/credentials/insecure"
"k8s.io/metrics/pkg/apis/external_metrics"
"k8s.io/metrics/pkg/apis/external_metrics/v1beta1"
Expand All @@ -29,7 +32,8 @@ import (
)

type GrpcClient struct {
client api.MetricsServiceClient
client api.MetricsServiceClient
connection *grpc.ClientConn
}

func NewGrpcClient(url string) (*GrpcClient, error) {
Expand All @@ -51,7 +55,7 @@ func NewGrpcClient(url string) (*GrpcClient, error) {
return nil, err
}

return &GrpcClient{client: api.NewMetricsServiceClient(conn)}, nil
return &GrpcClient{client: api.NewMetricsServiceClient(conn), connection: conn}, nil
}

func (c *GrpcClient) GetMetrics(ctx context.Context, scaledObjectName, scaledObjectNamespace, metricName string) (*external_metrics.ExternalMetricValueList, *api.PromMetricsMsg, error) {
Expand All @@ -68,3 +72,26 @@ func (c *GrpcClient) GetMetrics(ctx context.Context, scaledObjectName, scaledObj

return extMetrics, response.GetPromMetrics(), nil
}

// WaitForConnectionReady waits for gRPC connection to be ready
// returns true if the connection was successful, false if we hit a timeut from context
func (c *GrpcClient) WaitForConnectionReady(ctx context.Context, logger logr.Logger) bool {
currentState := c.connection.GetState()
if currentState != connectivity.Ready {
logger.Info("Waiting for establishing a gRPC connection to KEDA Metrics Server")
for {
select {
case <-ctx.Done():
return false
default:
c.connection.Connect()
time.Sleep(500 * time.Millisecond)
currentState := c.connection.GetState()
if currentState == connectivity.Ready {
return true
}
}
}
}
return true
}
33 changes: 20 additions & 13 deletions pkg/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,27 +92,34 @@ func (p *KedaProvider) GetExternalMetric(ctx context.Context, namespace string,

// Get Metrics from Metrics Service gRPC Server
if p.useMetricsServiceGrpc {
if !p.grpcClient.WaitForConnectionReady(ctx, logger) {
logger.Error(fmt.Errorf("timeout while waiting to establish gRPC connection to KEDA Metrics Server"), "timeout")
return nil, err
}

// selector is in form: `scaledobject.keda.sh/name: scaledobject-name`
scaledObjectName := selector.Get("scaledobject.keda.sh/name")

metrics, promMetrics, err := p.grpcClient.GetMetrics(ctx, scaledObjectName, namespace, info.Metric)
logger.V(1).WithValues("scaledObjectName", scaledObjectName, "scaledObjectNamespace", namespace, "metrics", metrics).Info("Receiving metrics")

// [DEPRECATED] handle exporting Prometheus metrics from Operator to Metrics Server
var scaledObjectErr error
if promMetrics.ScaledObjectErr {
scaledObjectErr = fmt.Errorf("scaledObject error")
}
promMetricsServer.RecordScaledObjectError(namespace, scaledObjectName, scaledObjectErr)
for _, scalerMetric := range promMetrics.ScalerMetric {
promMetricsServer.RecordHPAScalerMetric(namespace, scaledObjectName, scalerMetric.ScalerName, int(scalerMetric.ScalerIndex), scalerMetric.MetricName, float64(scalerMetric.MetricValue))
}
for _, scalerError := range promMetrics.ScalerError {
var scalerErr error
if scalerError.Error {
scalerErr = fmt.Errorf("scaler error")
if promMetrics != nil {
var scaledObjectErr error
if promMetrics.ScaledObjectErr {
scaledObjectErr = fmt.Errorf("scaledObject error")
}
promMetricsServer.RecordScaledObjectError(namespace, scaledObjectName, scaledObjectErr)
for _, scalerMetric := range promMetrics.ScalerMetric {
promMetricsServer.RecordHPAScalerMetric(namespace, scaledObjectName, scalerMetric.ScalerName, int(scalerMetric.ScalerIndex), scalerMetric.MetricName, float64(scalerMetric.MetricValue))
}
for _, scalerError := range promMetrics.ScalerError {
var scalerErr error
if scalerError.Error {
scalerErr = fmt.Errorf("scaler error")
}
promMetricsServer.RecordHPAScalerError(namespace, scaledObjectName, scalerError.ScalerName, int(scalerError.ScalerIndex), scalerError.MetricName, scalerErr)
}
promMetricsServer.RecordHPAScalerError(namespace, scaledObjectName, scalerError.ScalerName, int(scalerError.ScalerIndex), scalerError.MetricName, scalerErr)
}

return metrics, err
Expand Down