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

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

Merged
merged 12 commits into from
Dec 20, 2021
Merged

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

merged 12 commits into from
Dec 20, 2021

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #3490

What problem does this PR solve?

close #3483

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
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 added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/cherry-pick-not-approved labels Nov 18, 2021
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 18, 2021
Merged
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.3 This PR is cherry-picked to release-5.3 from a source PR. labels Nov 18, 2021
@nongfushanquan nongfushanquan added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Dec 14, 2021
@codecov-commenter
Copy link

codecov-commenter commented Dec 20, 2021 •
edited
Loading

Codecov Report

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

@@               Coverage Diff                @@
##             release-5.3      #3530   +/-   ##
================================================
  Coverage               ?   56.8912%           
================================================
  Files                  ?        213           
  Lines                  ?      22942           
  Branches               ?          0           
================================================
  Hits                   ?      13052           
  Misses                 ?       8559           
  Partials               ?       1331

@amyangfei
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

Commit hash: e4eebc1

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2021
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed status/can-merge Indicates a PR has been approved by a committer. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 20, 2021
@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: c444765

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 20, 2021
@ti-chi-bot ti-chi-bot merged commit 81af769 into pingcap:release-5.3 Dec 20, 2021
3AceShowHand pushed a commit to ti-chi-bot/tiflow that referenced this pull request Jan 13, 2022
@ti-chi-bot @3AceShowHand
owner: fix owner tick block http request (pingcap#3490) (pingcap#3530)
99eaa82
overvenus pushed a commit that referenced this pull request Jan 18, 2022
@ti-chi-bot @zhaoxinyu
@amyangfei @lance6716 @sdojjy @3AceShowHand
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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* fix conflicts.

* fix conflicts.

Co-authored-by: zhaoxinyu <[email protected]>
Co-authored-by: amyangfei <[email protected]>
Co-authored-by: lance6716 <[email protected]>
Co-authored-by: sdojjy <[email protected]>
Co-authored-by: Ling Jin <[email protected]>
Co-authored-by: 3AceShowHand <[email protected]>
@purelind purelind added this to the v5.3.1 milestone Feb 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@asddongmen asddongmen

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 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/bugfix This PR fixes a bug. type/cherry-pick-for-release-5.3 This PR is cherry-picked to release-5.3 from a source PR.
Projects
None yet
Milestone
v5.3.1
Development

Successfully merging this pull request may close these issues.
7 participants
@ti-chi-bot @codecov-commenter @amyangfei @overvenus @purelind @asddongmen @nongfushanquan