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

Jump to bottom

executor: parallel cancel mpp query #36161

Merged
merged 12 commits into from
Jul 13, 2022
Merged

executor: parallel cancel mpp query #36161

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fca60f1
parallel can mpp query
windtalker Jul 13, 2022
f666fd6
refine
windtalker Jul 13, 2022
fe89c0f
Update store/copr/mpp.go
windtalker Jul 13, 2022
008fb96
Update store/copr/mpp.go
windtalker Jul 13, 2022
9d247b3
address comments
windtalker Jul 13, 2022
d38d828
Merge branch 'master' into parallel_cancel
windtalker Jul 13, 2022
fc89857
Merge branch 'master' into parallel_cancel
hawkingrei Jul 13, 2022
4dc4799
Update mpp.go
hawkingrei Jul 13, 2022
2201af9
Merge branch 'master' into parallel_cancel
ti-chi-bot Jul 13, 2022
2006d66
Merge branch 'master' into parallel_cancel
ti-chi-bot Jul 13, 2022
425d2c8
Merge branch 'master' into parallel_cancel
ti-chi-bot Jul 13, 2022
d4d968c
Merge branch 'master' into parallel_cancel
ti-chi-bot Jul 13, 2022
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
16 changes: 11 additions & 5 deletions store/copr/mpp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/pingcap/tidb/kv"
"github.com/pingcap/tidb/store/driver/backoff"
derr "github.com/pingcap/tidb/store/driver/error"
"github.com/pingcap/tidb/util"
"github.com/pingcap/tidb/util/logutil"
"github.com/pingcap/tidb/util/mathutil"
"github.com/tikv/client-go/v2/tikv"
Expand Down Expand Up @@ -341,13 +342,18 @@ func (m *mppIterator) cancelMppTasks() {
}

// send cancel cmd to all stores where tasks run
wg := util.WaitGroupWrapper{}
for addr := range usedStoreAddrs {
_, err := m.store.GetTiKVClient().SendRequest(context.Background(), addr, wrappedReq, tikv.ReadTimeoutShort)
logutil.BgLogger().Debug("cancel task ", zap.Uint64("query id ", m.startTs), zap.String(" on addr ", addr))
if err != nil {
logutil.BgLogger().Error("cancel task error: ", zap.Error(err), zap.Uint64(" for query id ", m.startTs), zap.String(" on addr ", addr))
}
storeAddr := addr
wg.Run(func() {
_, err := m.store.GetTiKVClient().SendRequest(context.Background(), storeAddr, wrappedReq, tikv.ReadTimeoutShort)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to limit the batch number?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, the max number will be the TiFlash nodes in the cluster. Considering that TiDB always dispatchMPPTask to TiFlash node parallelly without limit, I think here is ok to not limit the batch number

logutil.BgLogger().Debug("cancel task", zap.Uint64("query id ", m.startTs), zap.String("on addr", storeAddr))
if err != nil {
logutil.BgLogger().Error("cancel task error", zap.Error(err), zap.Uint64("query id", m.startTs), zap.String("on addr", storeAddr))
}
})
}
wg.Wait()
}

func (m *mppIterator) establishMPPConns(bo *Backoffer, req *kv.MPPDispatchRequest, taskMeta *mpp.TaskMeta) {
Expand Down