Make --file-backup-storage-root dependent on binary version

Signed-off-by: Rohit Nayak <[email protected]>

Author: rohit-nayak-ps

go/flags/endtoend/vtctld.txt

@@ -16,7 +16,7 @@ vtctld \
 	--topo-global-root /vitess/ \
 	--service-map 'grpc-vtctl,grpc-vtctld' \
 	--backup-storage-implementation file \
-	--file_backup_storage_root $VTDATAROOT/backups \
+	--file-backup-storage-root $VTDATAROOT/backups \
 	--port 15000 \
 	--grpc-port 15999
 

go/test/endtoend/cluster/vtbackup_process.go

@@ -56,7 +56,10 @@ type VtbackupProcess struct {
 
 // Setup starts vtbackup process with required arguements
 func (vtbackup *VtbackupProcess) Setup() (err error) {
-
+	vtbackupVer, err := GetMajorVersion(vtbackup.Binary)
+	if err != nil {
+		return err
+	}
 	flags := map[string]string{
 		"--topo-implementation":        vtbackup.TopoImplementation,
 		"--topo-global-server-address": vtbackup.TopoGlobalAddress,
@@ -70,8 +73,8 @@ func (vtbackup *VtbackupProcess) Setup() (err error) {
 		"--init-shard":       vtbackup.Shard,
 
 		//Backup Arguments are not optional
-		"--backup-storage-implementation": vtbackup.BackupStorageImplementation,
-		"--file-backup-storage-root":      vtbackup.FileBackupStorageRoot,
+		utils.GetFlagVariantForTestsByVersion("--file-backup-storage-root", vtbackupVer): vtbackup.BackupStorageImplementation,
+		"--file-backup-storage-root": vtbackup.FileBackupStorageRoot,
 	}
 
 	utils.SetFlagVariantsForTests(flags, "--topo-implementation", vtbackup.TopoImplementation)

go/test/endtoend/cluster/vtctld_process.go

@@ -25,6 +25,7 @@ import (
 	"strings"
 	"syscall"
 	"time"
+	vtutils "vitess.io/vitess/go/vt/utils"
 
 	"vitess.io/vitess/go/vt/log"
 )
@@ -49,6 +50,10 @@ type VtctldProcess struct {
 
 // Setup starts vtctld process with required arguements
 func (vtctld *VtctldProcess) Setup(cell string, extraArgs ...string) (err error) {
+	vtctldVer, err := GetMajorVersion(vtctld.Binary)
+	if err != nil {
+		return err
+	}
 	_ = createDirectory(vtctld.LogDir, 0700)
 	_ = createDirectory(path.Join(vtctld.Directory, "backups"), 0700)
 	vtctld.proc = exec.Command(
@@ -60,7 +65,7 @@ func (vtctld *VtctldProcess) Setup(cell string, extraArgs ...string) (err error)
 		"--cell", cell,
 		"--service_map", vtctld.ServiceMap,
 		"--backup_storage_implementation", vtctld.BackupStorageImplementation,
-		"--file-backup-storage-root", vtctld.FileBackupStorageRoot,
+		vtutils.GetFlagVariantForTestsByVersion("--file-backup-storage-root", vtctldVer), vtctld.FileBackupStorageRoot,
 		"--log_dir", vtctld.LogDir,
 		"--port", fmt.Sprintf("%d", vtctld.Port),
 		"--grpc_port", fmt.Sprintf("%d", vtctld.GrpcPort),

go/test/endtoend/cluster/vttablet_process.go

@@ -35,6 +35,7 @@ import (
 	"syscall"
 	"testing"
 	"time"
+	vtutils "vitess.io/vitess/go/vt/utils"
 
 	"github.com/stretchr/testify/require"
 
@@ -92,6 +93,10 @@ type VttabletProcess struct {
 
 // Setup starts vttablet process with required arguements
 func (vttablet *VttabletProcess) Setup() (err error) {
+	vttabletVer, err := GetMajorVersion(vttablet.Binary)
+	if err != nil {
+		return err
+	}
 	vttablet.proc = exec.Command(
 		vttablet.Binary,
 		//TODO: Remove underscore(_) flags in v25, replace them with dashed(-) notation
@@ -110,7 +115,7 @@ func (vttablet *VttabletProcess) Setup() (err error) {
 		"--health_check_interval", fmt.Sprintf("%ds", vttablet.HealthCheckInterval),
 		"--enable_replication_reporter",
 		"--backup_storage_implementation", vttablet.BackupStorageImplementation,
-		"--file-backup-storage-root", vttablet.FileBackupStorageRoot,
+		vtutils.GetFlagVariantForTestsByVersion("--file-backup-storage-root", vttabletVer), vttablet.FileBackupStorageRoot,
 		"--service_map", vttablet.ServiceMap,
 		"--db_charset", vttablet.Charset,
 		"--bind-address", "127.0.0.1",

tools/generate_flag_testdata.sh

@@ -14,8 +14,11 @@ templatize_help_text() {
 
 export -f templatize_help_text
 
-while read -r testfile; do
+find "${DIR}" -iname '*.txt' \
+  | xargs -n1 -P"$(nproc)" bash -c '
+    testfile="$0"
     base="${testfile##*/}"
     binary="${base%.*}"
-    templatize_help_text "${binary}" > "${testfile}"
-done < <(find "${DIR}" -iname '*.txt')
+    templatize_help_text "$binary" > "$testfile"
+    echo "done: $testfile"
+  '