Skip to content
This repository has been archived by the owner on Jul 24, 2024. It is now read-only.

restore: auto remove/add pd scheduler in restore #123

Merged
merged 7 commits into from
Dec 24, 2019
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
23 changes: 11 additions & 12 deletions cmd/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ const (
flagBackupRateLimit = "ratelimit"
flagBackupConcurrency = "concurrency"
flagBackupChecksum = "checksum"
flagBackupDB = "db"
flagBackupTable = "table"
)

func defineBackupFlags(flagSet *pflag.FlagSet) {
Expand Down Expand Up @@ -91,6 +89,8 @@ func runBackup(flagSet *pflag.FlagSet, cmdName, db, table string) error {
return err
}

defer summary.Summary(cmdName)

ranges, backupSchemas, err := backup.BuildBackupRangeAndSchema(
mgr.GetDomain(), mgr.GetTiKV(), backupTS, db, table)
if err != nil {
Expand Down Expand Up @@ -151,7 +151,6 @@ func runBackup(flagSet *pflag.FlagSet, cmdName, db, table string) error {
if err != nil {
return err
}
summary.Summary(cmdName)
return nil
}

Expand Down Expand Up @@ -205,7 +204,7 @@ func newDbBackupCommand() *cobra.Command {
Use: "db",
Short: "backup a database",
RunE: func(command *cobra.Command, _ []string) error {
db, err := command.Flags().GetString(flagBackupDB)
db, err := command.Flags().GetString(flagDatabase)
if err != nil {
return err
}
Expand All @@ -215,8 +214,8 @@ func newDbBackupCommand() *cobra.Command {
return runBackup(command.Flags(), "Database backup", db, "")
},
}
command.Flags().StringP(flagBackupDB, "", "", "backup a table in the specific db")
_ = command.MarkFlagRequired(flagBackupDB)
command.Flags().StringP(flagDatabase, "", "", "backup a table in the specific db")
_ = command.MarkFlagRequired(flagDatabase)

return command
}
Expand All @@ -227,14 +226,14 @@ func newTableBackupCommand() *cobra.Command {
Use: "table",
Short: "backup a table",
RunE: func(command *cobra.Command, _ []string) error {
db, err := command.Flags().GetString(flagBackupDB)
db, err := command.Flags().GetString(flagDatabase)
if err != nil {
return err
}
if len(db) == 0 {
return errors.Errorf("empty database name is not allowed")
}
table, err := command.Flags().GetString(flagBackupTable)
table, err := command.Flags().GetString(flagTable)
if err != nil {
return err
}
Expand All @@ -244,9 +243,9 @@ func newTableBackupCommand() *cobra.Command {
return runBackup(command.Flags(), "Table backup", db, table)
},
}
command.Flags().StringP(flagBackupDB, "", "", "backup a table in the specific db")
command.Flags().StringP(flagBackupTable, "t", "", "backup the specific table")
_ = command.MarkFlagRequired(flagBackupDB)
_ = command.MarkFlagRequired(flagBackupTable)
command.Flags().StringP(flagDatabase, "", "", "backup a table in the specific db")
command.Flags().StringP(flagTable, "t", "", "backup the specific table")
_ = command.MarkFlagRequired(flagDatabase)
_ = command.MarkFlagRequired(flagTable)
return command
}
4 changes: 4 additions & 0 deletions cmd/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ const (
FlagStatusAddr = "status-addr"
// FlagSlowLogFile is the name of slow-log-file flag.
FlagSlowLogFile = "slow-log-file"

flagDatabase = "db"

flagTable = "table"
)

// AddFlags adds flags to the given cmd.
Expand Down
Loading