Rename Vitess fork of orchestrator to vtorc.

Makefile

@@ -69,7 +69,7 @@ endif
 install: build
 	# binaries
 	mkdir -p "$${PREFIX}/bin"
-	cp "$${VTROOT}/bin/"{mysqlctld,orchestrator,vtctld,vtctlclient,vtgate,vttablet,vtworker,vtbackup} "$${PREFIX}/bin/"
+	cp "$${VTROOT}/bin/"{mysqlctld,vtorc,vtctld,vtctlclient,vtgate,vttablet,vtworker,vtbackup} "$${PREFIX}/bin/"
 
 # install copies the files needed to run test Vitess using vtcombo into the given directory tree.
 # Usage: make install PREFIX=/path/to/install/root

go/test/endtoend/cluster/cluster_process.go

@@ -72,7 +72,7 @@ type LocalProcessCluster struct {
 	VtgateProcess   VtgateProcess
 	VtworkerProcess VtworkerProcess
 	VtbackupProcess VtbackupProcess
-	OrcProcess      *OrchestratorProcess
+	VtorcProcess    *VtorcProcess
 
 	nextPortForProcess int
 
@@ -505,9 +505,9 @@ func (cluster *LocalProcessCluster) Teardown() {
 		log.Errorf("Error in vtgate teardown: %v", err)
 	}
 
-	if cluster.OrcProcess != nil {
-		if err := cluster.OrcProcess.TearDown(); err != nil {
-			log.Errorf("Error in orchestrator teardown: %v", err)
+	if cluster.VtorcProcess != nil {
+		if err := cluster.VtorcProcess.TearDown(); err != nil {
+			log.Errorf("Error in vtorc teardown: %v", err)
 		}
 	}
 
@@ -674,11 +674,11 @@ func (cluster *LocalProcessCluster) NewVttabletInstance(tabletType string, UID i
 	}
 }
 
-// NewOrcProcess creates a new OrchestratorProcess object
-func (cluster *LocalProcessCluster) NewOrcProcess(configFile string) *OrchestratorProcess {
+// NewOrcProcess creates a new VtorcProcess object
+func (cluster *LocalProcessCluster) NewOrcProcess(configFile string) *VtorcProcess {
 	base := VtctlProcessInstance(cluster.TopoProcess.Port, cluster.Hostname)
-	base.Binary = "orchestrator"
-	return &OrchestratorProcess{
+	base.Binary = "vtorc"
+	return &VtorcProcess{
 		VtctlProcess: *base,
 		LogDir:       cluster.TmpDirectory,
 		Config:       configFile,

go/test/endtoend/cluster/orchestrator_process.go → go/test/endtoend/cluster/vtorc_process.go

@@ -28,9 +28,9 @@ import (
 	"vitess.io/vitess/go/vt/log"
 )
 
-// OrchestratorProcess is a test struct for running
-// orchestrator as a separate process for testing
-type OrchestratorProcess struct {
+// VtorcProcess is a test struct for running
+// vtorc as a separate process for testing
+type VtorcProcess struct {
 	VtctlProcess
 	LogDir    string
 	ExtraArgs []string
@@ -40,10 +40,10 @@ type OrchestratorProcess struct {
 }
 
 // Setup starts orc process with required arguements
-func (orc *OrchestratorProcess) Setup() (err error) {
+func (orc *VtorcProcess) Setup() (err error) {
 
 	/* minimal command line arguments:
-	$ orchestrator -topo_implementation etcd2 -topo_global_server_address localhost:2379 -topo_global_root /vitess/global
+	$ vtorc -topo_implementation etcd2 -topo_global_server_address localhost:2379 -topo_global_root /vitess/global
 	-config config/orchestrator/default.json -alsologtostderr http
 	*/
 	orc.proc = exec.Command(
@@ -82,8 +82,8 @@ func (orc *OrchestratorProcess) Setup() (err error) {
 	return nil
 }
 
-// TearDown shuts down the running orchestrator service
-func (orc *OrchestratorProcess) TearDown() error {
+// TearDown shuts down the running vtorc service
+func (orc *VtorcProcess) TearDown() error {
 	if orc.proc == nil || orc.exit == nil {
 		return nil
 	}

go/test/endtoend/orchestrator/orc_test.go

@@ -111,10 +111,10 @@ func createCluster(t *testing.T, numReplicas int, numRdonly int, orcExtraArgs []
 		require.NoError(t, err)
 	}
 
-	// Start orchestrator
-	clusterInstance.OrcProcess = clusterInstance.NewOrcProcess(path.Join(os.Getenv("PWD"), "test_config.json"))
-	clusterInstance.OrcProcess.ExtraArgs = orcExtraArgs
-	err = clusterInstance.OrcProcess.Setup()
+	// Start vtorc
+	clusterInstance.VtorcProcess = clusterInstance.NewOrcProcess(path.Join(os.Getenv("PWD"), "test_config.json"))
+	clusterInstance.VtorcProcess.ExtraArgs = orcExtraArgs
+	err = clusterInstance.VtorcProcess.Setup()
 	require.NoError(t, err)
 
 	return clusterInstance