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

ticdc/token-region: don't set metric to 0 since multiple tables share it #3480

Merged
merged 11 commits into from
Jan 12, 2022
Merged

ticdc/token-region: don't set metric to 0 since multiple tables share it #3480

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
62352e1
ticdc/token-region: don't set metric to 0 since multiple tables share it
amyangfei Nov 16, 2021
5e7cf26
Merge branch 'master' into fix-cached-region-metric
amyangfei Nov 16, 2021
68e772b
Merge branch 'master' into fix-cached-region-metric
amyangfei Dec 14, 2021
2ce3d63
Merge branch 'master' into fix-cached-region-metric
amyangfei Dec 20, 2021
f9dc847
Merge branch 'master' into fix-cached-region-metric
amyangfei Dec 21, 2021
149d196
Merge branch 'master' into fix-cached-region-metric
amyangfei Dec 28, 2021
bc49052
Update cdc/kv/token_region.go
amyangfei Dec 28, 2021
5e15bf1
Merge branch 'master' into fix-cached-region-metric
ti-chi-bot Jan 11, 2022
905720d
Merge branch 'master' into fix-cached-region-metric
ti-chi-bot Jan 11, 2022
72d6641
Merge branch 'master' into fix-cached-region-metric
ti-chi-bot Jan 12, 2022
42646f3
Merge branch 'master' into fix-cached-region-metric
ti-chi-bot Jan 12, 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
8 changes: 3 additions & 5 deletions cdc/kv/token_region.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ func (r *sizedRegionRouter) AddRegion(sri singleRegionInfo) {
r.buffer[id] = append(r.buffer[id], sri)
if _, ok := r.metrics.cachedRegions[id]; !ok {
r.metrics.cachedRegions[id] = cachedRegionSize.WithLabelValues(id, r.metrics.changefeed, r.metrics.capture)
r.metrics.cachedRegions[id].Set(0)
}
r.metrics.cachedRegions[id].Inc()
}
Expand All @@ -119,7 +118,6 @@ func (r *sizedRegionRouter) Acquire(id string) {
r.tokens[id]++
if _, ok := r.metrics.tokens[id]; !ok {
r.metrics.tokens[id] = clientRegionTokenSize.WithLabelValues(id, r.metrics.changefeed, r.metrics.capture)
r.metrics.tokens[id].Set(0)
}
r.metrics.tokens[id].Inc()
}
Expand All @@ -132,19 +130,19 @@ func (r *sizedRegionRouter) Release(id string) {
r.tokens[id]--
if _, ok := r.metrics.tokens[id]; !ok {
r.metrics.tokens[id] = clientRegionTokenSize.WithLabelValues(id, r.metrics.changefeed, r.metrics.capture)
r.metrics.tokens[id].Set(0)
}
r.metrics.tokens[id].Dec()
}

func (r *sizedRegionRouter) Run(ctx context.Context) error {
ticker := time.NewTicker(sizedRegionCheckInterval)
defer ticker.Stop()
amyangfei marked this conversation as resolved.
Show resolved Hide resolved
defer func() {
ticker.Stop()
r.lock.Lock()
defer r.lock.Unlock()
for _, m := range r.metrics.cachedRegions {
m.Set(0)
for id, buf := range r.buffer {
r.metrics.cachedRegions[id].Sub(float64(len(buf)))
}
}()
for {
Expand Down