vtctldclient: Add missing new backup option (vitessio#13543)

Signed-off-by: Dirkjan Bussink <d.bussink@gmail.com>

go/cmd/vtbackup/vtbackup.go

@@ -136,7 +136,7 @@ func registerFlags(fs *pflag.FlagSet) {
  fs.BoolVar(&initialBackup, "initial_backup", initialBackup, "Instead of restoring from backup, initialize an empty database with the provided init_db_sql_file and upload a backup of that for the shard, if the shard has no backups yet. This can be used to seed a brand new shard with an initial, empty backup. If any backups already exist for the shard, this will be considered a successful no-op. This can only be done before the shard exists in topology (i.e. before any tablets are deployed).")
  fs.BoolVar(&allowFirstBackup, "allow_first_backup", allowFirstBackup, "Allow this job to take the first backup of an existing shard.")
  fs.BoolVar(&restartBeforeBackup, "restart_before_backup", restartBeforeBackup, "Perform a mysqld clean/full restart after applying binlogs, but before taking the backup. Only makes sense to work around xtrabackup bugs.")
- fs.BoolVar(&upgradeSafe, "upgrade_safe", upgradeSafe, "Whether to use innodb_fast_shutdown=0 for the backup so it is safe to use for MySQL upgrades.")
+ fs.BoolVar(&upgradeSafe, "upgrade-safe", upgradeSafe, "Whether to use innodb_fast_shutdown=0 for the backup so it is safe to use for MySQL upgrades.")
  // vttablet-like flags
  fs.StringVar(&initDbNameOverride, "init_db_name_override", initDbNameOverride, "(init parameter) override the name of the db used by vttablet")
  fs.StringVar(&initKeyspace, "init_keyspace", initKeyspace, "(init parameter) keyspace to use for this tablet")

go/cmd/vtctldclient/command/backups.go

@@ -35,15 +35,15 @@ import (
 var (
  // Backup makes a Backup gRPC call to a vtctld.
  Backup = &cobra.Command{
- Use: "Backup [--concurrency <concurrency>] [--allow-primary] <tablet_alias>",
+ Use: "Backup [--concurrency <concurrency>] [--allow-primary] [--upgrade-safe] <tablet_alias>",
  Short: "Uses the BackupStorage service on the given tablet to create and store a new backup.",
  DisableFlagsInUseLine: true,
  Args: cobra.ExactArgs(1),
  RunE: commandBackup,
  }
  // BackupShard makes a BackupShard gRPC call to a vtctld.
  BackupShard = &cobra.Command{
- Use: "BackupShard [--concurrency <concurrency>] [--allow-primary] <keyspace/shard>",
+ Use: "BackupShard [--concurrency <concurrency>] [--allow-primary] [--upgrade-safe] <keyspace/shard>",
  Short: "Finds the most up-to-date REPLICA, RDONLY, or SPARE tablet in the given shard and uses the BackupStorage service on that tablet to create and store a new backup.",
  Long: `Finds the most up-to-date REPLICA, RDONLY, or SPARE tablet in the given shard and uses the BackupStorage service on that tablet to create and store a new backup.
 
@@ -81,6 +81,7 @@ If no replica-type tablet can be found, the backup can be taken on the primary i
 var backupOptions = struct {
  AllowPrimary bool
  Concurrency uint64
+ UpgradeSafe bool
 }{}
 
 func commandBackup(cmd *cobra.Command, args []string) error {
@@ -95,6 +96,7 @@ func commandBackup(cmd *cobra.Command, args []string) error {
  TabletAlias: tabletAlias,
  AllowPrimary: backupOptions.AllowPrimary,
  Concurrency: backupOptions.Concurrency,
+ UpgradeSafe: backupOptions.UpgradeSafe,
  })
  if err != nil {
  return err
@@ -116,6 +118,7 @@ func commandBackup(cmd *cobra.Command, args []string) error {
 var backupShardOptions = struct {
  AllowPrimary bool
  Concurrency uint64
+ UpgradeSafe bool
 }{}
 
 func commandBackupShard(cmd *cobra.Command, args []string) error {
@@ -131,6 +134,7 @@ func commandBackupShard(cmd *cobra.Command, args []string) error {
  Shard: shard,
  AllowPrimary: backupOptions.AllowPrimary,
  Concurrency: backupOptions.Concurrency,
+ UpgradeSafe: backupOptions.UpgradeSafe,
  })
  if err != nil {
  return err
@@ -255,10 +259,12 @@ func commandRestoreFromBackup(cmd *cobra.Command, args []string) error {
 func init() {
  Backup.Flags().BoolVar(&backupOptions.AllowPrimary, "allow-primary", false, "Allow the primary of a shard to be used for the backup. WARNING: If using the builtin backup engine, this will shutdown mysqld on the primary and stop writes for the duration of the backup.")
  Backup.Flags().Uint64Var(&backupOptions.Concurrency, "concurrency", 4, "Specifies the number of compression/checksum jobs to run simultaneously.")
+ Backup.Flags().BoolVar(&backupOptions.UpgradeSafe, "upgrade-safe", false, "Whether to use innodb_fast_shutdown=0 for the backup so it is safe to use for MySQL upgrades.")
  Root.AddCommand(Backup)
 
  BackupShard.Flags().BoolVar(&backupShardOptions.AllowPrimary, "allow-primary", false, "Allow the primary of a shard to be used for the backup. WARNING: If using the builtin backup engine, this will shutdown mysqld on the primary and stop writes for the duration of the backup.")
  BackupShard.Flags().Uint64Var(&backupShardOptions.Concurrency, "concurrency", 4, "Specifies the number of compression/checksum jobs to run simultaneously.")
+ BackupShard.Flags().BoolVar(&backupOptions.UpgradeSafe, "upgrade-safe", false, "Whether to use innodb_fast_shutdown=0 for the backup so it is safe to use for MySQL upgrades.")
  Root.AddCommand(BackupShard)
 
  GetBackups.Flags().Uint32VarP(&getBackupsOptions.Limit, "limit", "l", 0, "Retrieve only the most recent N backups.")

go/flags/endtoend/vtbackup.txt

@@ -183,7 +183,7 @@ Usage of vtbackup:
  --topo_zk_tls_ca string the server ca to use to validate servers when connecting to the zk topo server
  --topo_zk_tls_cert string the cert to use to connect to the zk topo server, requires topo_zk_tls_key, enables TLS
  --topo_zk_tls_key string the key to use to connect to the zk topo server, enables TLS
- --upgrade_safe Whether to use innodb_fast_shutdown=0 for the backup so it is safe to use for MySQL upgrades.
+ --upgrade-safe Whether to use innodb_fast_shutdown=0 for the backup so it is safe to use for MySQL upgrades.
  --v Level log level for V logs
  -v, --version print binary version
  --vmodule moduleSpec comma-separated list of pattern=N settings for file-filtered logging

go/vt/vtctl/backup.go

@@ -73,7 +73,7 @@ func commandBackup(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.F
  concurrency := subFlags.Int("concurrency", 4, "Specifies the number of compression/checksum jobs to run simultaneously")
  allowPrimary := subFlags.Bool("allow_primary", false, "Allows backups to be taken on primary. Warning!! If you are using the builtin backup engine, this will shutdown your primary mysql for as long as it takes to create a backup.")
  incrementalFromPos := subFlags.String("incremental_from_pos", "", "Position of previous backup. Default: empty. If given, then this backup becomes an incremental backup from given position. If value is 'auto', backup taken from last successful backup position")
- upgradeSafe := subFlags.Bool("upgrade_safe", false, "Whether to use innodb_fast_shutdown=0 for the backup so it is safe to use for MySQL upgrades.")
+ upgradeSafe := subFlags.Bool("upgrade-safe", false, "Whether to use innodb_fast_shutdown=0 for the backup so it is safe to use for MySQL upgrades.")
 
  if err := subFlags.Parse(args); err != nil {
  return err
@@ -114,7 +114,7 @@ func (b *backupEventStreamLogger) Send(resp *vtctldatapb.BackupResponse) error {
 func commandBackupShard(ctx context.Context, wr *wrangler.Wrangler, subFlags *pflag.FlagSet, args []string) error {
  concurrency := subFlags.Int("concurrency", 4, "Specifies the number of compression/checksum jobs to run simultaneously")
  allowPrimary := subFlags.Bool("allow_primary", false, "Whether to use primary tablet for backup. Warning!! If you are using the builtin backup engine, this will shutdown your primary mysql for as long as it takes to create a backup.")
- upgradeSafe := subFlags.Bool("upgrade_safe", false, "Whether to use innodb_fast_shutdown=0 for the backup so it is safe to use for MySQL upgrades.")
+ upgradeSafe := subFlags.Bool("upgrade-safe", false, "Whether to use innodb_fast_shutdown=0 for the backup so it is safe to use for MySQL upgrades.")
 
  if err := subFlags.Parse(args); err != nil {
  return err