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: remove the timezone from log-date #36369

Merged
merged 13 commits into from
Jul 21, 2022
Merged

log-backup: remove the timezone from log-date #36369

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6317c9d
log-backup: remove the timezone from log-date
MoCuishle28 Jul 20, 2022
75484bb
log-backup: remove the timezone from log-date
MoCuishle28 Jul 20, 2022
e1cd57f
Merge branch 'master' into pitr-date-format
3pointer Jul 20, 2022
64c7634
log-backup: remove the timezone from log-date
MoCuishle28 Jul 21, 2022
80d6788
Merge branch 'master' into pitr-date-format
3pointer Jul 21, 2022
c37cfff
Merge branch 'master' into pitr-date-format
3pointer Jul 21, 2022
ff9cb60
Merge branch 'master' into pitr-date-format
3pointer Jul 21, 2022
3cc66c0
Merge branch 'master' into pitr-date-format
ti-chi-bot Jul 21, 2022
b72d435
Merge branch 'master' into pitr-date-format
3pointer Jul 21, 2022
86270a5
Merge branch 'master' into pitr-date-format
ti-chi-bot Jul 21, 2022
8306463
Merge branch 'master' into pitr-date-format
3pointer Jul 21, 2022
170b67c
Merge branch 'master' into pitr-date-format
ti-chi-bot Jul 21, 2022
1b930d6
Merge branch 'master' into pitr-date-format
ti-chi-bot Jul 21, 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
6 changes: 3 additions & 3 deletions br/pkg/stream/stream_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ func (p *printByTable) AddTask(task TaskStatus) {
table := p.console.CreateTable()
table.Add("name", task.Info.Name)
table.Add("status", task.colorfulStatusString())
table.Add("start", fmt.Sprint(oracle.GetTimeFromTS(task.Info.StartTs)))
table.Add("start", fmt.Sprint(oracle.GetTimeFromTS(task.Info.StartTs).Format("2006-01-02 15:04:05.999999999 -0700")))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe use a common function and add a unit test case to make sure the output of this common function.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. PTAL

if task.Info.EndTs > 0 {
table.Add("end", fmt.Sprint(oracle.GetTimeFromTS(task.Info.EndTs)))
table.Add("end", fmt.Sprint(oracle.GetTimeFromTS(task.Info.EndTs).Format("2006-01-02 15:04:05.999999999 -0700")))
}
s := storage.FormatBackendURL(task.Info.GetStorage())
table.Add("storage", s.String())
Expand All @@ -133,7 +133,7 @@ func (p *printByTable) AddTask(task TaskStatus) {
if gap > 5*time.Minute {
gapColor = color.New(color.FgRed)
}
info := fmt.Sprintf("%s; gap=%s", pTime, gapColor.Sprint(gap))
info := fmt.Sprintf("%s; gap=%s", pTime.Format("2006-01-02 15:04:05.999999999 -0700"), gapColor.Sprint(gap))
return info
}
cp := task.GetMinStoreCheckpoint()
Expand Down
6 changes: 4 additions & 2 deletions br/pkg/task/stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,10 +575,12 @@ func RunStreamMetadata(
return errors.Trace(err)
}

logMinDate := oracle.GetTimeFromTS(logMinTS).Format("2006-01-02 15:04:05.999999999 -0700")
logMaxDate := oracle.GetTimeFromTS(logMaxTS).Format("2006-01-02 15:04:05.999999999 -0700")
summary.Log(cmdName, zap.Uint64("log-min-ts", logMinTS),
zap.String("log-min-date", oracle.GetTimeFromTS(logMinTS).String()),
zap.String("log-min-date", logMinDate),
zap.Uint64("log-max-ts", logMaxTS),
zap.String("log-max-date", oracle.GetTimeFromTS(logMaxTS).String()),
zap.String("log-max-date", logMaxDate),
)
return nil
}
Expand Down