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

fix : close resolver results in health check #6576

Merged
merged 4 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 3 additions & 1 deletion runtime/health.go
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func (r *Runtime) InstanceHealth(ctx context.Context, instanceID string) (*Insta
continue
}
}
_, err = r.Resolve(ctx, &ResolveOptions{
resolverRes, err := r.Resolve(ctx, &ResolveOptions{
InstanceID: ctrl.InstanceID,
Resolver: "metrics_time_range",
ResolverProperties: map[string]any{"metrics_view": mv.Meta.Name.Name},
Expand All @@ -151,6 +151,8 @@ func (r *Runtime) InstanceHealth(ctx context.Context, instanceID string) (*Insta
}
if err != nil {
mvHealth.Err = err.Error()
} else {
_ = resolverRes.Close()
}
res.MetricsViews[mv.Meta.Name.Name] = mvHealth
}
Expand Down
12 changes: 11 additions & 1 deletion runtime/resolver.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,13 +221,19 @@ func NewDriverResolverResult(result *drivers.Result) ResolverResult {
}

type driverResolverResult struct {
rows *drivers.Result
rows *drivers.Result
closeErr error
}

var _ ResolverResult = &driverResolverResult{}

// Close implements ResolverResult.
func (r *driverResolverResult) Close() error {
if r.closeErr != nil {
return r.closeErr
}
// it is okay to call Close multiple times
// so we don't need to track if it was already called
return r.rows.Close()
}

Expand All @@ -239,6 +245,7 @@ func (r *driverResolverResult) Schema() *runtimev1.StructType {
// Next implements ResolverResult.
func (r *driverResolverResult) Next() (map[string]any, error) {
if !r.rows.Next() {
r.closeErr = r.rows.Close()
return nil, io.EOF
}
row := make(map[string]any)
Expand All @@ -251,6 +258,9 @@ func (r *driverResolverResult) Next() (map[string]any, error) {

// MarshalJSON implements ResolverResult.
func (r *driverResolverResult) MarshalJSON() ([]byte, error) {
defer func() {
r.closeErr = r.rows.Close()
}()
var out []map[string]any
for r.rows.Next() {
row := make(map[string]any)
Expand Down
1 change: 1 addition & 0 deletions runtime/resolvers/metricsview_time_range.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ func newMetricsViewTimeRangeResolver(ctx context.Context, opts *runtime.Resolver
}

func (r *metricsViewTimeRangeResolver) Close() error {
r.executor.Close()
return nil
}

Expand Down
Loading