fix tests

Signed-off-by: Renan Rangel <[email protected]>
rvrangel · Sep 24, 2024 · 41cd68e · 41cd68e
1 parent f3b9e83
commit 41cd68e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/go/flags/endtoend/vtcombo.txt b/go/flags/endtoend/vtcombo.txt
@@ -310,7 +310,7 @@ Flags:
       --restore-to-timestamp string                                      (init incremental restore parameter) if set, run a point in time recovery that restores up to the given timestamp, if possible. Given timestamp in RFC3339 format. Example: '2006-01-02T15:04:05Z07:00'
       --restore_concurrency int                                          (init restore parameter) how many concurrent files to restore at once (default 4)
       --restore_from_backup                                              (init restore parameter) will check BackupStorage for a recent backup at startup and start there
-      --restore_from_backup_ignore_engines string                        ignore backups taken with the backup engines provided in this comma-separated list
+      --restore_from_backup_allowed_engines strings                      if present will filter out any backups taken with engines not included in the list
       --restore_from_backup_ts string                                    (init restore parameter) if set, restore the latest backup taken at or before this timestamp. Example: '2021-04-29.133050'
       --retain_online_ddl_tables duration                                How long should vttablet keep an old migrated table before purging it (default 24h0m0s)
       --sanitize_log_messages                                            Remove potentially sensitive information in tablet INFO, WARNING, and ERROR log messages such as query parameters.

diff --git a/go/flags/endtoend/vttablet.txt b/go/flags/endtoend/vttablet.txt
@@ -300,7 +300,7 @@ Flags:
       --restore-to-timestamp string                                      (init incremental restore parameter) if set, run a point in time recovery that restores up to the given timestamp, if possible. Given timestamp in RFC3339 format. Example: '2006-01-02T15:04:05Z07:00'
       --restore_concurrency int                                          (init restore parameter) how many concurrent files to restore at once (default 4)
       --restore_from_backup                                              (init restore parameter) will check BackupStorage for a recent backup at startup and start there
-      --restore_from_backup_ignore_engines string                        ignore backups taken with the backup engines provided in this comma-separated list
+      --restore_from_backup_allowed_engines strings                      if present will filter out any backups taken with engines not included in the list
       --restore_from_backup_ts string                                    (init restore parameter) if set, restore the latest backup taken at or before this timestamp. Example: '2021-04-29.133050'
       --retain_online_ddl_tables duration                                How long should vttablet keep an old migrated table before purging it (default 24h0m0s)
       --s3_backup_aws_endpoint string                                    endpoint of the S3 backend (region must be provided).

diff --git a/go/vt/vttablet/tabletmanager/restore.go b/go/vt/vttablet/tabletmanager/restore.go
@@ -66,7 +66,7 @@ var (
 
 func registerRestoreFlags(fs *pflag.FlagSet) {
 	fs.BoolVar(&restoreFromBackup, "restore_from_backup", restoreFromBackup, "(init restore parameter) will check BackupStorage for a recent backup at startup and start there")
-	fs.StringSliceVar(&restoreFromBackupAllowedEngines, "restore_from_backup_ignore_engines", restoreFromBackupAllowedEngines, "if present will filter out any backups taken with engines not included in the list")
+	fs.StringSliceVar(&restoreFromBackupAllowedEngines, "restore_from_backup_allowed_engines", restoreFromBackupAllowedEngines, "if present will filter out any backups taken with engines not included in the list")
 	fs.StringVar(&restoreFromBackupTsStr, "restore_from_backup_ts", restoreFromBackupTsStr, "(init restore parameter) if set, restore the latest backup taken at or before this timestamp. Example: '2021-04-29.133050'")
 	fs.IntVar(&restoreConcurrency, "restore_concurrency", restoreConcurrency, "(init restore parameter) how many concurrent files to restore at once")
 	fs.DurationVar(&waitForBackupInterval, "wait_for_backup_interval", waitForBackupInterval, "(init restore parameter) if this is greater than 0, instead of starting up empty when no backups are found, keep checking at this interval for a backup to appear")

diff --git a/test/ci_workflow_gen.go b/test/ci_workflow_gen.go
@@ -136,7 +136,6 @@ var (
 		"xb_backup",
 		"xb_recovery",
 		"backup_pitr_xtrabackup",
-		"vtctlbackup_sharded_clustertest_heavy",
 	}
 	clustersRequiringMakeTools = []string{
 		"18",