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

executor: fix baseExecutor'children may not be closed (#11570) #11576

Merged
merged 3 commits into from
Aug 5, 2019
Merged

executor: fix baseExecutor'children may not be closed (#11570) #11576

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4d948f
executor: fix baseExecutor'children may not close
zimulala Aug 1, 2019
9d88247
Merge branch 'release-3.0' into release-3.0-ea16273d44ca
zimulala Aug 5, 2019
240c0f1
Merge branch 'release-3.0' into release-3.0-ea16273d44ca
sre-bot Aug 5, 2019
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
10 changes: 5 additions & 5 deletions executor/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@ func (e *baseExecutor) Open(ctx context.Context) error {

// Close closes all executors and release all resources.
func (e *baseExecutor) Close() error {
for _, child := range e.children {
err := child.Close()
if err != nil {
return err
var firstErr error
for _, src := range e.children {
if err := src.Close(); err != nil && firstErr == nil {
firstErr = err
}
}
return nil
return firstErr
}

// Schema returns the current baseExecutor's schema. If it is nil, then create and return a new one.
Expand Down