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

owner: includes stopped changefeed when calculating gc safepoint #797

Merged
merged 6 commits into from
Aug 3, 2020
Merged

owner: includes stopped changefeed when calculating gc safepoint #797

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2466328
owner: includes stopped changefeed when calculating gc safepoint
amyangfei Jul 24, 2020
5ed7c1d
Merge branch 'master' into gc-safepoint-for-failed-feeds
amyangfei Jul 30, 2020
9bd7f00
fix gc safepoint is not cleared when no changefeed
amyangfei Jul 30, 2020
747a31c
fix error
amyangfei Jul 30, 2020
c8a7b12
Merge branch 'master' into gc-safepoint-for-failed-feeds
ti-srebot Aug 3, 2020
9f1d390
Merge branch 'master' into gc-safepoint-for-failed-feeds
ti-srebot Aug 3, 2020
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
Prev Previous commit
Next Next commit
Merge branch 'master' into gc-safepoint-for-failed-feeds
  • Loading branch information
@amyangfei
amyangfei committed Jul 30, 2020
commit 5ed7c1d58afd1a1e8bf1d4da593e10f54bcfff42
9 changes: 3 additions & 6 deletions cdc/owner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,16 +446,13 @@ func (o *Owner) loadChangeFeeds(ctx context.Context) error {
if err != nil && errors.Cause(err) != model.ErrChangeFeedNotExists {
return err
}
if status != nil && (status.AdminJobType == model.AdminStop || status.AdminJobType == model.AdminRemove) {
switch status.AdminJobType {
case model.AdminStop:
if status != nil && status.AdminJobType.IsStopState() {
if status.AdminJobType == model.AdminStop {
if _, ok := o.stoppedFeeds[changeFeedID]; !ok {
o.stoppedFeeds[changeFeedID] = status
}
continue
case model.AdminRemove:
continue
}
continue
}
checkpointTs := cfInfo.GetCheckpointTs(status)

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.