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

metrics(cdc): fix mq sink write row count metrics. #4192

Merged

ti-chi-bot merged 9 commits into pingcap:master from 3AceShowHand:fix-mq-metrics

Jan 4, 2022

Contributor

3AceShowHand commented Jan 3, 2022 •

edited

Loading

What problem does this PR solve?

Issue Number: close #3431

What is changed and how it works?

For Canal-JSON, sink-write-rows-count is not correctly recorded, this PR only fixes Canal-JSON at the moment.

Maybe we should take further investigation into sink related metrics, and tries to unify them together.

Check List

Tests

No code

Code changes

Side effects

Related changes

Release note

 `None`.


          fix canal json sink write row count metrics.

519690b

Member

ti-chi-bot commented Jan 3, 2022 •

edited

Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

asddongmen
overvenus

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

ti-chi-bot added release-note-none size/XS labels

codecov-commenter commented Jan 3, 2022 •

edited

Loading

Codecov Report

Merging #4192 (519690b) into master (08da001) will increase coverage by 0.1224%.
The diff coverage is 56.7242%.

Flag	Coverage Δ
cdc	`58.8054% <57.6318%> (+0.1606%)`	⬆️
dm	`52.2797% <52.8000%> (+0.0252%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@@               Coverage Diff                @@
##             master      #4192        +/-   ##
================================================
+ Coverage   55.1722%   55.2947%   +0.1224%     
================================================
  Files           485        489         +4     
  Lines         59829      60702       +873     
================================================
+ Hits          33009      33565       +556     
- Misses        23484      23735       +251     
- Partials       3336       3402        +66

3AceShowHand added 2 commits

January 3, 2022 18:45


          also check rowsCount when Building the message.

8c3caf4


          refine the comment about

13b4af4

ti-chi-bot added size/S and removed size/XS labels


          refine avro and canal.

114c281

ti-chi-bot added size/M and removed size/S labels


          refine the code.

dd48b03

ti-chi-bot added size/S and removed size/M labels

3AceShowHand changed the title ~~[DNM] metrics(cdc): fix canal json sink write row count metrics.~~ metrics(cdc): fix canal json sink write row count metrics.


          Merge branch 'master' into fix-mq-metrics

35a9387

3AceShowHand requested review from zhaoxinyu and overvenus

January 4, 2022 03:14

3AceShowHand changed the title ~~metrics(cdc): fix canal json sink write row count metrics.~~ metrics(cdc): fix mq sink write row count metrics.

3AceShowHand added 2 commits

January 4, 2022 11:23


          fix maxwell.

ccae11f


          Merge branch 'fix-mq-metrics' of https://github.com/3AceShowHand/tiflow…

9115c23

… into fix-mq-metrics

overvenus approved these changes

View reviewed changes

Member

overvenus left a comment

LGTM

ti-chi-bot added the status/LGT1 label


          Merge branch 'master' into fix-mq-metrics

e9bb53c

3AceShowHand added needs-cherry-pick-release-4.0 needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 labels

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request


          This is an automated cherry-pick of pingcap#4192

4a0499a

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot mentioned this pull request

metrics(cdc): fix mq sink write row count metrics. (#4192) #4206

Merged

Member

ti-chi-bot commented Jan 4, 2022

In response to a cherrypick label: new pull request created: #4206.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request


          This is an automated cherry-pick of pingcap#4192

821efbe

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot mentioned this pull request

metrics(cdc): fix mq sink write row count metrics. (#4192) #4207

Merged

Member

ti-chi-bot commented Jan 4, 2022

In response to a cherrypick label: new pull request created: #4207.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request


          This is an automated cherry-pick of pingcap#4192

2a2111c

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot mentioned this pull request

metrics(cdc): fix mq sink write row count metrics. (#4192) #4208

Closed

Member

ti-chi-bot commented Jan 4, 2022

In response to a cherrypick label: new pull request created: #4208.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request


          This is an automated cherry-pick of pingcap#4192

f4d61d8

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot mentioned this pull request

metrics(cdc): fix mq sink write row count metrics. (#4192) #4209

Closed

Member

ti-chi-bot commented Jan 4, 2022

In response to a cherrypick label: new pull request created: #4209.

ti-chi-bot mentioned this pull request

metrics(cdc): fix mq sink write row count metrics. (#4192) #4210

Merged

Member

ti-chi-bot commented Jan 4, 2022

In response to a cherrypick label: new pull request created: #4210.

ti-chi-bot added a commit that referenced this pull request


          metrics(cdc): fix mq sink write row count metrics. (#4192) (#4210)

e6c613b

close #3431

3AceShowHand added a commit to ti-chi-bot/tiflow that referenced this pull request


          This is an automated cherry-pick of pingcap#4192

9f84f95

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

3AceShowHand added a commit to ti-chi-bot/tiflow that referenced this pull request


          This is an automated cherry-pick of pingcap#4192

088edf5

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

Contributor Author

3AceShowHand commented Jan 13, 2022

/cherry-pick release-5.3
/cherry-pick release-5.2

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request


          This is an automated cherry-pick of pingcap#4192

f65fa37

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot mentioned this pull request

metrics(cdc): fix mq sink write row count metrics. (#4192) #4322

Merged

Member

ti-chi-bot commented Jan 13, 2022

@3AceShowHand: new pull request created: #4322.

In response to this:

/cherry-pick release-5.3
/cherry-pick release-5.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot pushed a commit to ti-chi-bot/tiflow that referenced this pull request


          This is an automated cherry-pick of pingcap#4192

62dd140

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

ti-chi-bot mentioned this pull request

metrics(cdc): fix mq sink write row count metrics. (#4192) #4323

Merged

Member

ti-chi-bot commented Jan 13, 2022

@3AceShowHand: new pull request created: #4323.

In response to this:

/cherry-pick release-5.3
/cherry-pick release-5.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

overvenus pushed a commit that referenced this pull request


          metrics(cdc): fix mq sink write row count metrics. (#4192) (#4206)

f7005f0

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix conflicts.

Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>

overvenus pushed a commit that referenced this pull request


          metrics(cdc): fix mq sink write row count metrics. (#4192) (#4205)

588f512

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix conflicts.

Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>

overvenus pushed a commit that referenced this pull request


          metrics(cdc): fix mq sink write row count metrics. (#4192) (#4207)

3acebd2

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix conflicts.

Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>

overvenus pushed a commit that referenced this pull request


          metrics(cdc): fix mq sink write row count metrics. (#4192) (#4322)

a5ce862

* fix the txn_batch_size metric inaccuracy bug when the sink target is MQ

* address comments

* add comments for exported functions

* fix the compiling problem

* workerpool: limit the rate to output deadlock warning (#3775) (#3799)

* metrics: add changefeed checkepoint catch-up ETA (#3300) (#3311)

* pkg,cdc: do not use log package (#3902) (#3939)

* *: rename repo from pingcap/ticdc to pingcap/tiflow (#3957)

* kvclient(ticdc): fix kvclient takes too long time to recover (#3612) (#3662)

* tz (ticdc): fix timezone error (#3887) (#3910)

* http_*: add log for http api and refine the err handle logic (#2997) (#3306)

* ticdc/alert: add no owner alert rule (#3809) (#3831)

* etcd_worker: batch etcd patch (#3277) (#3393)

* ticdc/owner: Fix ddl special comment syntax error (#3845) (#3977)

* Clean old owner and old processor in release 5.2 branch (#4019)

* tests(ticdc): set up the sync diff output directory correctly (#3725) (#3745)

* owner,scheduler(cdc): fix nil pointer panic in owner scheduler (#2980) (#4007) (#4015)

* config(ticdc): Fix old value configuration check for maxwell protocol (#3747) (#3782)

* ticdc/processor: Fix backoff base delay misconfiguration (#3992) (#4027)

* sink(ticdc): cherry pick sink bug fix to release 5.2 (#4083) (#4119)

* metrics(ticdc): add resolved ts and add changefeed to dataflow (#4038) (#4103)

* kv(ticdc): reduce eventfeed rate limited log (#4072) (#4110)

close #4006

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* http_api (ticdc): fix http api 'get processor' panic. (#4117) (#4122)

close #3840

* cdc/sink: adjust kafka initialization logic (#3192) (#3568)

* This is an automated cherry-pick of #3192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix conflicts.

* This is an automated cherry-pick of #3682

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix import.

* fix failpoint path.

* try to fix initialize.

* remove table_sink.

* remove initialization.

* remove owner.

* fix mq.

Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>

* sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) (#4098)

close #4055

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix conflicts.

* fix conflicts.

* fix conflicts.

Co-authored-by: zhaoxinyu <zhaoxinyu512@gmail.com>
Co-authored-by: amyangfei <yangfei@pingcap.com>
Co-authored-by: dongmen <20351731+asddongmen@users.noreply.github.com>
Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>

overvenus pushed a commit that referenced this pull request


          metrics(cdc): fix mq sink write row count metrics. (#4192) (#4323)

ae04769

* fix the txn_batch_size metric inaccuracy bug when the sink target is MQ

* address comments

* add comments for exported functions

* fix the compiling problem

* workerpool: limit the rate to output deadlock warning (#3775) (#3795)

* tests(ticdc): set up the sync diff output directory correctly (#3725) (#3741)

* relay(dm): use binlog name comparison (#3710) (#3712)

* dm/load: fix concurrent call Loader.Status (#3459) (#3468)

* cdc/sorter: make unified sorter cgroup aware (#3436) (#3439)

* tz (ticdc): fix timezone error (#3887) (#3906)

* pkg,cdc: do not use log package (#3902) (#3940)

* *: rename repo from pingcap/ticdc to pingcap/tiflow (#3959)

* http_*: add log for http api and refine the err handle logic (#2997) (#3307)

* etcd_worker: batch etcd patch (#3277) (#3389)

* http_api (ticdc): check --cert-allowed-cn before add server common name (#3628) (#3882)

* kvclient(ticdc): fix kvclient takes too long time to recover (#3612) (#3663)

* owner: fix owner tick block http request (#3490) (#3530)

* dm/syncer: use downstream PK/UK to generate DML (#3168) (#3256)

* dep(dm): update go-mysql (#3914) (#3934)

* dm/syncer: multiple rows use downstream schema (#3308) (#3953)

* errorutil,sink,syncer: add errorutil to handle ignorable error (#3264) (#3995)

* dm/worker: don't exit when failed to read checkpoint in relay (#3345) (#4005)

* syncer(dm): use an early location to reset binlog and open safemode (#3860)

* ticdc/owner: Fix ddl special comment syntax error (#3845) (#3978)

* dm/scheduler: fix inconsistent of relay status (#3474) (#4009)

* owner,scheduler(cdc): fix nil pointer panic in owner scheduler (#2980) (#4007) (#4016)

* config(ticdc): Fix old value configuration check for maxwell protocol (#3747) (#3783)

* sink(ticdc): cherry pick sink bug fix to release 5.3 (#4083)

* master(dm): clean and treat invalid load task (#4004) (#4145)

* loader: fix wrong progress in query-status for loader (#4093) (#4143)

close #3252

* ticdc/processor: Fix backoff base delay misconfiguration (#3992) (#4028)

* dm: load table structure from dump files (#3295) (#4163)

* compactor: fix duplicate entry in safemode (#3432) (#3434) (#4088)

* kv(ticdc): reduce eventfeed rate limited log (#4072) (#4111)

close #4006

* metrics(ticdc): add resolved ts and add changefeed to dataflow (#4038) (#4104)

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* retry(dm): align with tidb latest error message (#4172) (#4254)

close #4159, close #4246

* owner(ticdc): Add bootstrap and try to fix the meta information in it (#3838) (#3865)

* redolog: add a precleanup process when s3 enable (#3525) (#3878)

* ddl(dm): make skipped ddl pass `SplitDDL()` (#4176) (#4227)

close #4173

* cdc/sink: remove Initialize method from the sink interface (#3682) (#3765)

Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>

* http_api (ticdc): fix http api 'get processor' panic. (#4117) (#4123)

close #3840

* sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (#4084) (#4099)

close #4055

* cdc/sink: adjust kafka initialization logic (#3192) (#4162)

* try fix conflicts.

* This is an automated cherry-pick of #4192

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

* fix conflicts.

* fix conflicts.

Co-authored-by: zhaoxinyu <zhaoxinyu512@gmail.com>
Co-authored-by: amyangfei <yangfei@pingcap.com>
Co-authored-by: lance6716 <lance6716@gmail.com>
Co-authored-by: sdojjy <sdojjy@qq.com>
Co-authored-by: Ling Jin <7138436+3AceShowHand@users.noreply.github.com>
Co-authored-by: 3AceShowHand <jinl1037@hotmail.com>

zhaoxinyu pushed a commit to zhaoxinyu/ticdc that referenced this pull request


          metrics(cdc): fix mq sink write row count metrics. (pingcap#4192)

6d8fef7

close pingcap#3431

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-cherry-pick-release-4.0 needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 needs-cherry-pick-release-5.4 release-note-none size/S status/can-merge status/LGT2