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

log-backup: format the date displayed in --help #36713

Merged
merged 5 commits into from
Jul 29, 2022
+4 −4
Merged

log-backup: format the date displayed in --help #36713

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32dd2d6
log-backup: format the date displayed in --help
MoCuishle28 Jul 29, 2022
8fa3e6e
Merge branch 'master' into fix-for-pitr-doc
joccau Jul 29, 2022
cc358c6
Merge branch 'master' into fix-for-pitr-doc
3pointer Jul 29, 2022
7850408
Merge branch 'master' into fix-for-pitr-doc
3pointer Jul 29, 2022
b292a5f
Merge branch 'master' into fix-for-pitr-doc
ti-chi-bot Jul 29, 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
4 changes: 2 additions & 2 deletions br/pkg/task/restore.go
View file
Original file line number Diff line number Diff line change
@@ -171,9 +171,9 @@ func DefineRestoreFlags(flags *pflag.FlagSet) {
// DefineStreamRestoreFlags defines for the restore log command.
func DefineStreamRestoreFlags(command *cobra.Command) {
command.Flags().String(FlagStreamStartTS, "", "the start timestamp which log restore from.\n"+
"support TSO or datetime, e.g. '400036290571534337' or '2018-05-11 01:42:23'")
"support TSO or datetime, e.g. '400036290571534337' or '2018-05-11 01:42:23+0800'")
command.Flags().String(FlagStreamRestoreTS, "", "the point of restore, used for log restore.\n"+
"support TSO or datetime, e.g. '400036290571534337' or '2018-05-11 01:42:23'")
"support TSO or datetime, e.g. '400036290571534337' or '2018-05-11 01:42:23+0800'")
command.Flags().String(FlagStreamFullBackupStorage, "", "specify the backup full storage. "+
"fill it if want restore full backup before restore log.")
}
4 changes: 2 additions & 2 deletions br/pkg/task/stream.go
View file
Original file line number Diff line number Diff line change
@@ -144,7 +144,7 @@ func DefineStreamStartFlags(flags *pflag.FlagSet) {

flags.String(flagStreamStartTS, "",
"usually equals last full backupTS, used for backup log. Default value is current ts.\n"+
"support TSO or datetime, e.g. '400036290571534337' or '2018-05-11 01:42:23'.")
"support TSO or datetime, e.g. '400036290571534337' or '2018-05-11 01:42:23+0800'.")
// 999999999999999999 means 2090-11-18 22:07:45
flags.String(flagStreamEndTS, "999999999999999999", "end ts, indicate stopping observe after endTS"+
"support TSO or datetime")
@@ -176,7 +176,7 @@ func DefineStreamStatusCommonFlags(flags *pflag.FlagSet) {

func DefineStreamTruncateLogFlags(flags *pflag.FlagSet) {
flags.String(flagUntil, "", "Remove all backup data until this TS."+
"(support TSO or datetime, e.g. '400036290571534337' or '2018-05-11 01:42:23'.)")
"(support TSO or datetime, e.g. '400036290571534337' or '2018-05-11 01:42:23+0800'.)")
flags.Bool(flagDryRun, false, "Run the command but don't really delete the files.")
flags.BoolP(flagYes, "y", false, "Skip all prompts and always execute the command.")
}