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

Merged
merged 5 commits into from
Nov 18, 2021
Merged

owner: fix owner tick block http request #3490

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7740829
owner: fix owner tick block http api
asddongmen Nov 17, 2021
f88e7ae
owner_test: add unit test
asddongmen Nov 17, 2021
f0d89cf
owner: resolves comments
asddongmen Nov 18, 2021
932e945
Merge branch 'master' into fix_owner_block_http_api
3AceShowHand Nov 18, 2021
02e1b61
Merge branch 'master' into fix_owner_block_http_api
liuzix Nov 18, 2021
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
4 changes: 2 additions & 2 deletions cdc/owner/owner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,13 @@ func (o *Owner) Tick(stdCtx context.Context, rawState orchestrator.ReactorState)
state := rawState.(*orchestrator.GlobalReactorState)
o.captures = state.Captures
o.updateMetrics(state)
o.handleJobs()

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

// Owner should update GC safepoint before initializing changefeed, so
// changefeed can remove its "ticdc-creating" service GC safepoint during
// initializing.
Expand All @@ -133,7 +134,6 @@ func (o *Owner) Tick(stdCtx context.Context, rawState orchestrator.ReactorState)
return nil, errors.Trace(err)
}

o.handleJobs()
for changefeedID, changefeedState := range state.Changefeeds {
if changefeedState.Info == nil {
o.cleanUpChangefeed(changefeedState)
Expand Down