Fix backup tests

Signed-off-by: Matt Lord <[email protected]>
vitessio · Jan 3, 2025 · b2b65c8 · b2b65c8
1 parent 8f66a9f
commit b2b65c8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/go/test/endtoend/backup/vtctlbackup/backup_utils.go b/go/test/endtoend/backup/vtctlbackup/backup_utils.go
@@ -1483,6 +1483,7 @@ func getDefaultCommonArgs() []string {
 		"--watch_replication_stream",
 		"--enable_replication_reporter",
 		"--serving_state_grace_period", "1s",
+		"--file_backup_storage_root", cluster.FileBackupStorageRoot,
 	}
 }
 

diff --git a/go/test/endtoend/cluster/vtbackup_process.go b/go/test/endtoend/cluster/vtbackup_process.go
@@ -28,6 +28,8 @@ import (
 	"vitess.io/vitess/go/vt/log"
 )
 
+var FileBackupStorageRoot string = path.Join(os.Getenv("VTDATAROOT"), "backups")
+
 // VtbackupProcess is a generic handle for a running Vtbackup.
 // It can be spawned manually
 type VtbackupProcess struct {
@@ -67,7 +69,7 @@ func (vtbackup *VtbackupProcess) Setup() (err error) {
 
 		//Backup Arguments are not optional
 		"--backup_storage_implementation", "file",
-		"--file_backup_storage_root", path.Join(os.Getenv("VTDATAROOT"), "tmp", "backupstorage"),
+		"--file_backup_storage_root", FileBackupStorageRoot,
 	)
 
 	if vtbackup.initialBackup {

diff --git a/go/test/endtoend/cluster/vtctld_process.go b/go/test/endtoend/cluster/vtctld_process.go
@@ -171,7 +171,7 @@ func VtctldProcessInstance(httpPort int, grpcPort int, topoPort int, hostname st
 		VtProcess:                   *base,
 		ServiceMap:                  "grpc-vtctl,grpc-vtctld",
 		BackupStorageImplementation: "file",
-		FileBackupStorageRoot:       path.Join(os.Getenv("VTDATAROOT"), "/backups"),
+		FileBackupStorageRoot:       FileBackupStorageRoot,
 		LogDir:                      tmpDirectory,
 		Port:                        httpPort,
 		GrpcPort:                    grpcPort,

diff --git a/go/test/endtoend/cluster/vtorc_process.go b/go/test/endtoend/cluster/vtorc_process.go
@@ -116,7 +116,7 @@ func (orc *VTOrcProcess) Setup() (err error) {
 	--config config/vtorc/default.json --alsologtostderr
 	*/
 	orc.proc = exec.Command(
-		"vtorc",
+		orc.Binary,
 		"--topo_implementation", orc.TopoImplementation,
 		"--topo_global_server_address", orc.TopoGlobalAddress,
 		"--topo_global_root", orc.TopoGlobalRoot,

diff --git a/go/test/endtoend/cluster/vttablet_process.go b/go/test/endtoend/cluster/vttablet_process.go
@@ -736,7 +736,7 @@ func VttabletProcessInstance(port, grpcPort, tabletUID int, cell, shard, keyspac
 		SupportsBackup:              true,
 		ServingStatus:               "NOT_SERVING",
 		BackupStorageImplementation: "file",
-		FileBackupStorageRoot:       path.Join(os.Getenv("VTDATAROOT"), "/backups"),
+		FileBackupStorageRoot:       FileBackupStorageRoot,
 		TabletUID:                   tabletUID,
 		Charset:                     charset,
 	}

diff --git a/go/test/endtoend/recovery/unshardedrecovery/recovery.go b/go/test/endtoend/recovery/unshardedrecovery/recovery.go
@@ -55,7 +55,9 @@ var (
 		"--degraded_threshold", "5s",
 		"--lock_tables_timeout", "5s",
 		"--watch_replication_stream",
-		"--serving_state_grace_period", "1s"}
+		"--serving_state_grace_period", "1s",
+		"--file_backup_storage_root", cluster.FileBackupStorageRoot,
+	}
 	recoveryKS1  = "recovery_ks1"
 	recoveryKS2  = "recovery_ks2"
 	vtInsertTest = `create table vt_insert_test (