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

log-backup: fix checkpoint display #36166

Merged
merged 9 commits into from
Jul 13, 2022
Merged

log-backup: fix checkpoint display #36166

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e45f44
fix checkpoint display
YuJuncen Jul 12, 2022
c0d7583
Merge branch 'master' into cp-fix-display
joccau Jul 13, 2022
b0af407
Merge branch 'master' into cp-fix-display
joccau Jul 13, 2022
a08aa23
Merge branch 'master' into cp-fix-display
joccau Jul 13, 2022
5c71647
Merge branch 'master' into cp-fix-display
ti-chi-bot Jul 13, 2022
4bd4ce0
Merge branch 'master' into cp-fix-display
hawkingrei Jul 13, 2022
a57e0e4
Merge branch 'master' into cp-fix-display
hawkingrei Jul 13, 2022
ae8fd27
Merge branch 'master' into cp-fix-display
hawkingrei Jul 13, 2022
b471846
Merge branch 'master' into cp-fix-display
joccau Jul 13, 2022
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
10 changes: 3 additions & 7 deletions br/pkg/stream/stream_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@ func (p *printByTable) AddTask(task TaskStatus) {
info := fmt.Sprintf("%s; gap=%s", pTime, gapColor.Sprint(gap))
return info
}
cp := task.GetMinStoreCheckpoint()
table.Add("checkpoint[global]", formatTS(cp.TS))
p.addCheckpoints(&task, table, formatTS)
for store, e := range task.LastErrors {
table.Add(fmt.Sprintf("error[store=%d]", store), e.ErrorCode)
Expand All @@ -147,21 +149,15 @@ func (p *printByTable) AddTask(task TaskStatus) {

func (p *printByTable) addCheckpoints(task *TaskStatus, table *glue.Table, formatTS func(uint64) string) {
cp := task.GetMinStoreCheckpoint()
items := make([][2]string, 0, len(task.Checkpoints))
if cp.Type() != CheckpointTypeGlobal {
for _, cp := range task.Checkpoints {
switch cp.Type() {
case CheckpointTypeStore:
items = append(items, [2]string{fmt.Sprintf("checkpoint[store=%d]", cp.ID), formatTS(cp.TS)})
table.Add(fmt.Sprintf("checkpoint[store=%d]", cp.ID), formatTS(cp.TS))
}
}
} else {
items = append(items, [2]string{"checkpoint[central-global]", formatTS(cp.TS)})
}

for _, item := range items {
table.Add(item[0], item[1])
}
}

func (p *printByTable) PrintTasks() {
Expand Down