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.

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

Exit the for-loop after 5 gRPC communication errors #218

Merged
merged 4 commits into from
Sep 3, 2024
Merged
Changes from 1 commit
Commits
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
14 changes: 13 additions & 1 deletion pkg/connectorrunner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import (
"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/durationpb"

v1 "github.com/conductorone/baton-sdk/pb/c1/connectorapi/baton/v1"
Expand Down Expand Up @@ -128,8 +130,9 @@ func (c *connectorRunner) run(ctx context.Context) error {

waitDuration := time.Second * 0
errCount := 0
commErrCount := 0
var err error
for {
for commErrCount < 5 {
shackra marked this conversation as resolved.
Show resolved Hide resolved
shackra marked this conversation as resolved.
Show resolved Hide resolved
select {
case <-ctx.Done():
return c.handleContextCancel(ctx)
Expand Down Expand Up @@ -194,6 +197,14 @@ func (c *connectorRunner) run(ctx context.Context) error {
defer sem.Release(1)
err := c.processTask(ctx, t)
if err != nil {
switch code := status.Code(err); code {
case codes.Canceled:
commErrCount++
case codes.Unknown:
shackra marked this conversation as resolved.
Show resolved Hide resolved
commErrCount++
default:
l.Info("Received gRPC error code", zap.Uint32("grpc_code", uint32(code)))
}
l.Error("runner: error processing task", zap.Error(err), zap.String("task_id", t.Id), zap.String("task_type", tasks.GetType(t).String()))
}
l.Debug("runner: task processed", zap.String("task_id", t.Id), zap.String("task_type", tasks.GetType(t).String()))
Expand All @@ -202,6 +213,7 @@ func (c *connectorRunner) run(ctx context.Context) error {
l.Debug("runner: dispatched task, waiting for next task", zap.Duration("wait_duration", waitDuration))
}
}
return nil
}

func (c *connectorRunner) Close(ctx context.Context) error {
Expand Down
Loading