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

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

Merged
merged 32 commits into from
Jan 18, 2022
Merged

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

merged 32 commits into from
Jan 18, 2022

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4192

What problem does this PR solve?

Issue Number: close #3431

What is changed and how it works?

image

image

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`.

zhaoxinyu and others added 27 commits December 10, 2021 03:22
@zhaoxinyu @ti-chi-bot
fix the txn_batch_size metric inaccuracy bug when the sink target is MQ
def4d82
@zhaoxinyu @ti-chi-bot
address comments
630ec41
@zhaoxinyu @ti-chi-bot
add comments for exported functions
7e584b1
@zhaoxinyu @ti-chi-bot
fix the compiling problem
c3c0ac5
@ti-chi-bot @3AceShowHand
workerpool: limit the rate to output deadlock warning (pingcap#3775) (p…
db3d42e 
…ingcap#3799)
@ti-chi-bot @3AceShowHand
metrics: add changefeed checkepoint catch-up ETA (pingcap#3300) (ping…
eaa63a2 
…cap#3311)
@ti-chi-bot @3AceShowHand
pkg,cdc: do not use log package (pingcap#3902) (pingcap#3939)
ef9a4fe
@amyangfei @3AceShowHand
*: rename repo from pingcap/ticdc to pingcap/tiflow (pingcap#3957)
3c36fc0
@ti-chi-bot @3AceShowHand
kvclient(ticdc): fix kvclient takes too long time to recover (pingcap…
d93f48e 
…#3612) (pingcap#3662)
@ti-chi-bot @3AceShowHand
tz (ticdc): fix timezone error (pingcap#3887) (pingcap#3910)
cff3be9
@ti-chi-bot @3AceShowHand
http_*: add log for http api and refine the err handle logic (pingcap…
276e74c 
…#2997) (pingcap#3306)
@ti-chi-bot @3AceShowHand
ticdc/alert: add no owner alert rule (pingcap#3809) (pingcap#3831)
47f28b0
@ti-chi-bot @3AceShowHand
etcd_worker: batch etcd patch (pingcap#3277) (pingcap#3393)
bb8b7c1
@ti-chi-bot @3AceShowHand
ticdc/owner: Fix ddl special comment syntax error (pingcap#3845) (pin…
4915083 
…gcap#3977)
@asddongmen @3AceShowHand
Clean old owner and old processor in release 5.2 branch (pingcap#4019)
93020bb
@ti-chi-bot @3AceShowHand
tests(ticdc): set up the sync diff output directory correctly (pingca…
2ac75e4 
…p#3725) (pingcap#3745)
@ti-chi-bot @3AceShowHand
owner,scheduler(cdc): fix nil pointer panic in owner scheduler (pingc…
149f3f4 
…ap#2980) (pingcap#4007) (pingcap#4015)
@ti-chi-bot @3AceShowHand
config(ticdc): Fix old value configuration check for maxwell protocol (…
28614b3 
…pingcap#3747) (pingcap#3782)
@ti-chi-bot @3AceShowHand
ticdc/processor: Fix backoff base delay misconfiguration (pingcap#3992)…
6476b37 
… (pingcap#4027)
@ti-chi-bot @3AceShowHand
sink(ticdc): cherry pick sink bug fix to release 5.2 (pingcap#4083) (p…
7e39a2f 
…ingcap#4119)
@ti-chi-bot @3AceShowHand
metrics(ticdc): add resolved ts and add changefeed to dataflow (pingc…
6228225 
…ap#4038) (pingcap#4103)
@ti-chi-bot @3AceShowHand
kv(ticdc): reduce eventfeed rate limited log (pingcap#4072) (pingcap#…
75957ec 
…4110)

close pingcap#4006
@3AceShowHand
This is an automated cherry-pick of pingcap#4192
9f84f95 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot @3AceShowHand
http_api (ticdc): fix http api 'get processor' panic. (pingcap#4117) (p…
4ca5c72 
…ingcap#4122)

close pingcap#3840
@ti-chi-bot @3AceShowHand
cdc/sink: adjust kafka initialization logic (pingcap#3192) (pingcap#3568
03a292e 
)

* This is an automated cherry-pick of pingcap#3192

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

* fix conflicts.

* This is an automated cherry-pick of pingcap#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>
@ti-chi-bot @3AceShowHand
sink (ticdc): fix a deadlock due to checkpointTs fall back in sinkNode (
9a99748 
pingcap#4084) (pingcap#4098)

close pingcap#4055
@3AceShowHand @ti-chi-bot
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 ti-chi-bot force-pushed the cherry-pick-4192-to-release-5.2 branch from 9a99748 to f65fa37 Compare January 13, 2022 13:08
@ti-chi-bot
Copy link
Member Author

[REVIEW NOTIFICATION]

This pull request has not been approved.

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 ti-chi-bot mentioned this pull request Jan 13, 2022
Merged
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. do-not-merge/cherry-pick-not-approved type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR. labels Jan 13, 2022
@overvenus overvenus added this to the v5.2.4 milestone Jan 17, 2022
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 18, 2022
@ti-chi-bot ti-chi-bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 18, 2022
@codecov-commenter
Copy link

codecov-commenter commented Jan 18, 2022 •
edited
Loading

Codecov Report

❗ No coverage uploaded for pull request base (release-5.2@87115bc). Click here to learn what that means.
The diff coverage is n/a.

@@               Coverage Diff                @@
##             release-5.2      #4322   +/-   ##
================================================
  Coverage               ?   57.3377%           
================================================
  Files                  ?        189           
  Lines                  ?      19127           
  Branches               ?          0           
================================================
  Hits                   ?      10967           
  Misses                 ?       7214           
  Partials               ?        946

@nongfushanquan nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Jan 18, 2022
@3AceShowHand
Copy link
Contributor

/run-all-tests

@overvenus
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member Author

This pull request has been accepted and is ready to merge.

Commit hash: 098a9c5

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Jan 18, 2022
@overvenus overvenus merged commit a5ce862 into pingcap:release-5.2 Jan 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@3AceShowHand 3AceShowHand

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-5.2 This PR is cherry-picked to release-5.2 from a source PR.
Projects
None yet
Milestone
v5.2.4
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-chi-bot @codecov-commenter @3AceShowHand @overvenus @nongfushanquan @zhaoxinyu @amyangfei @asddongmen