owner: fix owner tick block http request #3490

asddongmen · 2021-11-17T03:01:35Z

What problem does this PR solve?

What is changed and how it works?

Move o.handleJobs() before this check:

	if !o.clusterVersionConsistent(state.Captures) {
		// sleep one second to avoid printing too much log
		time.Sleep(1 * time.Second)
		return state, nil
	}

The http_handler in master branch is now get / put data from status_provider interface, which comunicate with the owner directly through pushOwnerJob method provided by the owner. And all owner jobs will be handle in the owner's tick logic. So, if the tick was blocked by the version check mentioned above, the owner jobs willl never be handle until timeout.

Check List

Tests

Manual test (add detailed scripts or steps below)
Unit Test

Code changes

Side effects

Related changes

Release note

Fix HTTP API not working when there are TiCDC nodes of different versions in one cdc cluster.

ti-chi-bot · 2021-11-17T03:01:36Z

[REVIEW NOTIFICATION]

This pull request has been approved by:

3AceShowHand
liuzix

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.

asddongmen · 2021-11-17T03:07:55Z

/run-integration-tests

liuzix · 2021-11-17T03:35:25Z

Can you try to add unit tests for this case?

codecov-commenter · 2021-11-17T03:57:05Z

Codecov Report

Merging #3490 (7740829) into master (24030f8) will increase coverage by 0.9296%.
The diff coverage is 65.1685%.

@@               Coverage Diff                @@
##             master      #3490        +/-   ##
================================================
+ Coverage   56.5356%   57.4653%   +0.9296%     
================================================
  Files           211        229        +18     
  Lines         22798      23522       +724     
================================================
+ Hits          12889      13517       +628     
- Misses         8598       8642        +44     
- Partials       1311       1363        +52

asddongmen · 2021-11-17T06:25:40Z

And you try to a a unit tests for this case?

I will do this.

amyangfei

Please add a release note

asddongmen · 2021-11-17T07:47:17Z

@liuzix ut added, PTAL.

asddongmen · 2021-11-17T09:35:31Z

@3AceShowHand PTAL~

3AceShowHand · 2021-11-18T03:13:28Z

please make the release note more concise, and can you add some comments about cautions for this change?

liuzix · 2021-11-18T15:35:47Z

/merge

ti-chi-bot · 2021-11-18T15:35:50Z

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

Commit hash: 02e1b61

ti-chi-bot · 2021-11-18T16:04:26Z

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

* 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>

owner: fix owner tick block http api

7740829

ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 17, 2021

asddongmen requested review from maxshuang and liuzix November 17, 2021 03:08

amyangfei added type/bugfix This PR fixes a bug. needs-cherry-pick-release-5.3 Should cherry pick this PR to release-5.3 branch. labels Nov 17, 2021

amyangfei reviewed Nov 17, 2021

View reviewed changes

owner_test: add unit test

f88e7ae

ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 17, 2021

liuzix approved these changes Nov 17, 2021

View reviewed changes

ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 17, 2021

asddongmen requested a review from 3AceShowHand November 17, 2021 09:35

owner: resolves comments

f0d89cf

3AceShowHand approved these changes Nov 18, 2021

View reviewed changes

ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 18, 2021

3AceShowHand and others added 2 commits November 18, 2021 18:47

Merge branch 'master' into fix_owner_block_http_api

932e945

Merge branch 'master' into fix_owner_block_http_api

02e1b61

ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 18, 2021

ti-chi-bot merged commit a40a157 into pingcap:master Nov 18, 2021

ti-chi-bot mentioned this pull request Nov 18, 2021

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

Merged

ti-chi-bot added a commit that referenced this pull request Dec 20, 2021

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

81af769

asddongmen deleted the fix_owner_block_http_api branch December 22, 2021 08:07

3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022

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

99eaa82

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

owner: fix owner tick block http request #3490

owner: fix owner tick block http request #3490

asddongmen commented Nov 17, 2021 •

edited by liuzix

Loading

ti-chi-bot commented Nov 17, 2021 •

edited

Loading

asddongmen commented Nov 17, 2021

liuzix commented Nov 17, 2021 •

edited

Loading

codecov-commenter commented Nov 17, 2021

asddongmen commented Nov 17, 2021

amyangfei left a comment

asddongmen commented Nov 17, 2021

asddongmen commented Nov 17, 2021

3AceShowHand commented Nov 18, 2021

liuzix commented Nov 18, 2021

ti-chi-bot commented Nov 18, 2021

ti-chi-bot commented Nov 18, 2021

owner: fix owner tick block http request #3490

owner: fix owner tick block http request #3490

Conversation

asddongmen commented Nov 17, 2021 • edited by liuzix Loading

What problem does this PR solve?

What is changed and how it works?

Check List

Release note

ti-chi-bot commented Nov 17, 2021 • edited Loading

asddongmen commented Nov 17, 2021

liuzix commented Nov 17, 2021 • edited Loading

codecov-commenter commented Nov 17, 2021

Codecov Report

asddongmen commented Nov 17, 2021

amyangfei left a comment

Choose a reason for hiding this comment

asddongmen commented Nov 17, 2021

asddongmen commented Nov 17, 2021

3AceShowHand commented Nov 18, 2021

liuzix commented Nov 18, 2021

ti-chi-bot commented Nov 18, 2021

ti-chi-bot commented Nov 18, 2021

asddongmen commented Nov 17, 2021 •

edited by liuzix

Loading

ti-chi-bot commented Nov 17, 2021 •

edited

Loading

liuzix commented Nov 17, 2021 •

edited

Loading