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

etcd_worker: batch etcd patch #3277

Merged
merged 25 commits into from
Nov 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
9423c4d
etcd_worker: batch etcd patch
asddongmen Nov 3, 2021
95b3f01
Merge branch 'master' into batch_patch_to_etcd
asddongmen Nov 4, 2021
4469137
etcd_worker: batch etcd patch
asddongmen Nov 4, 2021
e1c605c
etcd_worker: batch etcd watch response
asddongmen Nov 5, 2021
c60e88a
etcd_worker: batch etcd watch response
asddongmen Nov 5, 2021
4a0b41b
Merge remote-tracking branch 'origin/batch_patch_to_etcd' into batch_…
asddongmen Nov 6, 2021
27c232c
batch: extract batch logic into func
asddongmen Nov 6, 2021
78153a8
batch_test:fix check error
asddongmen Nov 7, 2021
b0c066b
batch_test:fix make check error
asddongmen Nov 7, 2021
f7a5681
batch_test: fix error
asddongmen Nov 8, 2021
2df2d75
etcd_worker: clean useless code
asddongmen Nov 8, 2021
bdea0aa
Merge branch 'master' into batch_patch_to_etcd
asddongmen Nov 8, 2021
e439671
Merge remote-tracking branch 'origin/batch_patch_to_etcd' into batch_…
asddongmen Nov 8, 2021
ff9aa38
etcd_worker: add metrics
asddongmen Nov 8, 2021
5d0f3ef
etcd_worker: add metrics
asddongmen Nov 8, 2021
7ab6d6d
Merge remote-tracking branch 'origin/batch_patch_to_etcd' into batch_…
asddongmen Nov 8, 2021
043b6b5
etcd_worker: add getBatchChangedState to get batch changedSate of mul…
asddongmen Nov 9, 2021
9a7a5a0
batch: fix some typos and resolves comments
asddongmen Nov 9, 2021
c84fd55
Merge branch 'master' into batch_patch_to_etcd
liuzix Nov 10, 2021
b4cc17b
batch: resolves comments
asddongmen Nov 10, 2021
a253cb0
Merge branch 'master' into batch_patch_to_etcd
ti-chi-bot Nov 10, 2021
a7d6c69
Merge branch 'master' into batch_patch_to_etcd
ti-chi-bot Nov 10, 2021
a2ed317
Merge branch 'master' into batch_patch_to_etcd
asddongmen Nov 10, 2021
3d0f583
Merge branch 'master' into batch_patch_to_etcd
ti-chi-bot Nov 10, 2021
0573167
Merge branch 'master' into batch_patch_to_etcd
ti-chi-bot Nov 11, 2021
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
3 changes: 2 additions & 1 deletion cdc/capture/capture.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,8 @@ func (c *Capture) runEtcdWorker(ctx cdcContext.Context, reactor orchestrator.Rea
if err != nil {
return errors.Trace(err)
}
if err := etcdWorker.Run(ctx, c.session, timerInterval); err != nil {
captureAddr := c.info.AdvertiseAddr
if err := etcdWorker.Run(ctx, c.session, timerInterval, captureAddr); err != nil {
// We check ttl of lease instead of check `session.Done`, because
// `session.Done` is only notified when etcd client establish a
// new keepalive request, there could be a time window as long as
Expand Down
2 changes: 2 additions & 0 deletions cdc/metrics.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"github.com/pingcap/ticdc/cdc/sorter/unified"
"github.com/pingcap/ticdc/pkg/actor"
"github.com/pingcap/ticdc/pkg/etcd"
"github.com/pingcap/ticdc/pkg/orchestrator"
"github.com/prometheus/client_golang/prometheus"
)

Expand All @@ -46,6 +47,7 @@ func init() {
etcd.InitMetrics(registry)
initServerMetrics(registry)
actor.InitMetrics(registry)
orchestrator.InitMetrics(registry)
// Sorter metrics
sorter.InitMetrics(registry)
memory.InitMetrics(registry)
Expand Down
5 changes: 5 additions & 0 deletions errors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,11 @@ error = '''
the etcd txn should be aborted and retried immediately
'''

["CDC:ErrEtcdTxnSizeExceed"]
error = '''
patch size of a single changefeed exceed etcd txn max size
'''

["CDC:ErrEventFeedAborted"]
error = '''
single event feed aborted
Expand Down
Loading