Skip to content

Commit c006316

Browse files
GuptaManan100GuptaManan100
authored
Refactor: Rename Orchestrator to VTOrc in the codebase (vitessio#11231)
* feat: rename orchestrator package to vtorc Signed-off-by: Manan Gupta <[email protected]> * feat: rename web/orchestrator to web/vtorc Signed-off-by: Manan Gupta <[email protected]> * feat: changed usage of orchestrator to vtorc Signed-off-by: Manan Gupta <[email protected]> * feat: changed usage of Orchestrator to VTOrc Signed-off-by: Manan Gupta <[email protected]> * feat: refactor function names to move from orchestrator to vtorc Signed-off-by: Manan Gupta <[email protected]> * test: fix function name Signed-off-by: Manan Gupta <[email protected]> * feat: change Vtorc to VTOrc Signed-off-by: Manan Gupta <[email protected]> * feat: fix static check failures for not catching errors Signed-off-by: Manan Gupta <[email protected]> * feat: create a symbolic link for web/vtorc Signed-off-by: Manan Gupta <[email protected]> * feat: add web/vtorc to docker images and use it in the examples Signed-off-by: Manan Gupta <[email protected]> * feat: rename orchestrator to vtorc in examples Signed-off-by: Manan Gupta <[email protected]> * feat: rename VtOrc to VTOrc Signed-off-by: Manan Gupta <[email protected]> * feat: remove redundant retrun statements Signed-off-by: Manan Gupta <[email protected]> Signed-off-by: Manan Gupta <[email protected]>
1 parent 943b261 commit c006316

File tree

236 files changed

+879
-801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+879
-801
lines changed

‎.github/CODEOWNERS

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ bootstrap.sh @deepthi
1616
/go/mysql @harshit-gangal @systay @mattlord
1717
/go/protoutil @ajm188
1818
/go/test/endtoend/onlineddl @shlomi-noach
19-
/go/test/endtoend/orchestrator @deepthi @shlomi-noach @GuptaManan100
19+
/go/test/endtoend/vtorc @deepthi @shlomi-noach @GuptaManan100
2020
/go/test/endtoend/messaging @mattlord @rohit-nayak-ps @derekperkins
2121
/go/test/endtoend/vtgate @harshit-gangal @systay @frouioui
2222
/go/vt/discovery @deepthi
2323
/go/vt/mysqlctl @deepthi @mattlord
24-
/go/vt/orchestrator @deepthi @shlomi-noach @GuptaManan100
24+
/go/vt/vtorc @deepthi @shlomi-noach @GuptaManan100
2525
/go/vt/proto/vtadmin @ajm188 @doeg @notfelineit
2626
/go/vt/schema @shlomi-noach
2727
/go/vt/servenv @deepthi @ajm188

‎config/orchestrator/default.json ‎config/vtorc/default.json

File renamed without changes.

‎docker/lite/Dockerfile.alpine

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ ENV MYSQL_FLAVOR MariaDB103
5252
# Copy artifacts from builder layer.
5353
COPY --from=builder --chown=vitess:vitess /vt/install /vt
5454
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
55+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
5556
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
5657

5758
# Create mount point for actual data (e.g. MySQL data dir)

‎docker/lite/Dockerfile.mariadb

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ ENV MYSQL_FLAVOR MariaDB
5252
# Copy artifacts from builder layer.
5353
COPY --from=builder --chown=vitess:vitess /vt/install /vt
5454
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
55+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
5556
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
5657

5758
# Create mount point for actual data (e.g. MySQL data dir)

‎docker/lite/Dockerfile.mariadb103

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ ENV MYSQL_FLAVOR MariaDB103
5252
# Copy artifacts from builder layer.
5353
COPY --from=builder --chown=vitess:vitess /vt/install /vt
5454
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
55+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
5556
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
5657

5758
# Create mount point for actual data (e.g. MySQL data dir)

‎docker/lite/Dockerfile.mysql57

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ ENV PATH $VTROOT/bin:$PATH
5151
# Copy artifacts from builder layer.
5252
COPY --from=builder --chown=vitess:vitess /vt/install /vt
5353
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
54+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
5455
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
5556

5657
# Create mount point for actual data (e.g. MySQL data dir)

‎docker/lite/Dockerfile.mysql80

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ ENV MYSQL_FLAVOR MySQL80
5252
# Copy artifacts from builder layer.
5353
COPY --from=builder --chown=vitess:vitess /vt/install /vt
5454
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
55+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
5556
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
5657

5758
# Create mount point for actual data (e.g. MySQL data dir)

‎docker/lite/Dockerfile.percona57

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ ENV PATH $VTROOT/bin:$PATH
5151
# Copy artifacts from builder layer.
5252
COPY --from=builder --chown=vitess:vitess /vt/install /vt
5353
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
54+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
5455
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
5556

5657
# Create mount point for actual data (e.g. MySQL data dir)

‎docker/lite/Dockerfile.percona80

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ ENV MYSQL_FLAVOR MySQL80
5252
# Copy artifacts from builder layer.
5353
COPY --from=builder --chown=vitess:vitess /vt/install /vt
5454
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
55+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
5556
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
5657

5758
# Create mount point for actual data (e.g. MySQL data dir)

‎docker/lite/Dockerfile.testing

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ ENV PATH $VTROOT/bin:$PATH
5151
# Copy artifacts from builder layer.
5252
COPY --from=builder --chown=vitess:vitess /vt/install /vt
5353
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
54+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
5455
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
5556

5657
# Create mount point for actual data (e.g. MySQL data dir)

‎docker/lite/Dockerfile.ubi7.mysql57

+1
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ ENV PATH $VTROOT/bin:$PATH
7979
# Copy artifacts from builder layer.
8080
COPY --from=builder --chown=vitess:vitess /vt/install /vt
8181
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
82+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
8283
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
8384

8485
RUN mkdir -p /licenses

‎docker/lite/Dockerfile.ubi7.mysql80

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ ENV MYSQL_FLAVOR MySQL80
8080
# Copy artifacts from builder layer.
8181
COPY --from=builder --chown=vitess:vitess /vt/install /vt
8282
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
83+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
8384
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
8485

8586
RUN mkdir -p /licenses

‎docker/lite/Dockerfile.ubi7.percona57

+1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ ENV PATH $VTROOT/bin:$PATH
7070
# Copy artifacts from builder layer.
7171
COPY --from=builder --chown=vitess:vitess /vt/install /vt
7272
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
73+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
7374
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
7475

7576
RUN mkdir -p /licenses

‎docker/lite/Dockerfile.ubi7.percona80

+1
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ ENV MYSQL_FLAVOR MySQL80
7575
# Copy artifacts from builder layer.
7676
COPY --from=builder --chown=vitess:vitess /vt/install /vt
7777
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
78+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
7879
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
7980

8081
RUN mkdir -p /licenses

‎docker/lite/Dockerfile.ubi8.arm64.mysql80

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ ENV MYSQL_FLAVOR MySQL80
8787
# Copy artifacts from builder layer.
8888
COPY --from=builder --chown=vitess:vitess /vt/install /vt
8989
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
90+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
9091
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
9192

9293
RUN mkdir -p /licenses

‎docker/lite/Dockerfile.ubi8.mysql80

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ ENV MYSQL_FLAVOR MySQL80
8585
# Copy artifacts from builder layer.
8686
COPY --from=builder --chown=vitess:vitess /vt/install /vt
8787
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/orchestrator /vt/web/orchestrator
88+
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtorc /vt/web/vtorc
8889
COPY --from=builder --chown=vitess:vitess /vt/src/vitess.io/vitess/web/vtadmin /vt/web/vtadmin
8990

9091
RUN mkdir -p /licenses

‎examples/compose/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Flags available:
5959
6060
6161
### Start the cluster
62-
To start Consul(which saves the topology config), vtctld, vtgate, orchestrator and a few vttablets with MySQL running on them.
62+
To start Consul(which saves the topology config), vtctld, vtgate, vtorc and a few vttablets with MySQL running on them.
6363
```
6464
vitess/examples/compose$ docker-compose up -d
6565
```
@@ -150,7 +150,7 @@ vitess/examples/compose$ ./lvtctl.sh Help
150150
- vtgate web ui:
151151
http://localhost:15099/debug/status
152152
153-
- orchestrator web ui:
153+
- vtorc web ui:
154154
http://localhost:13000
155155
156156
- Stream querylog

‎examples/compose/vtcompose/vtcompose.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ func applyDefaultDockerPatches(
482482
dockerComposeFile = applyInMemoryPatch(dockerComposeFile, generateVtctld(opts))
483483
dockerComposeFile = applyInMemoryPatch(dockerComposeFile, generateVtgate(opts))
484484
dockerComposeFile = applyInMemoryPatch(dockerComposeFile, generateVreplication(dbInfo, opts))
485-
dockerComposeFile = applyInMemoryPatch(dockerComposeFile, generateVtorc(dbInfo, keyspaceInfoMap, opts))
485+
dockerComposeFile = applyInMemoryPatch(dockerComposeFile, generateVTOrc(dbInfo, keyspaceInfoMap, opts))
486486
return dockerComposeFile
487487
}
488488

@@ -723,7 +723,7 @@ func generateVtgate(opts vtOptions) string {
723723
`, opts.webPort, opts.gRpcPort, opts.mySqlPort, opts.topologyFlags, opts.cell)
724724
}
725725

726-
func generateVtorc(dbInfo externalDbInfo, keyspaceInfoMap map[string]keyspaceInfo, opts vtOptions) string {
726+
func generateVTOrc(dbInfo externalDbInfo, keyspaceInfoMap map[string]keyspaceInfo, opts vtOptions) string {
727727
externalDb := "0"
728728
if dbInfo.dbName != "" {
729729
externalDb = "1"

‎examples/compose/vtorc-up.sh

+11-11
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,28 @@
1717
set -u
1818

1919
external=${EXTERNAL_DB:-0}
20-
config=${VTORC_CONFIG:-/vt/orchestrator/config.json}
20+
config=${VTORC_CONFIG:-/vt/vtorc/config.json}
2121
# Copy config directory
22-
cp -R /script/orchestrator /vt
22+
cp -R /script/vtorc /vt
2323
# Update credentials
2424
if [ $external = 1 ] ; then
2525
# Terrible substitution but we don't have jq in this image
2626
# This can be overridden by passing VTORC_CONFIG env variable
2727
echo "Updating $config..."
28-
cp /vt/orchestrator/default.json /vt/orchestrator/tmp.json
29-
sed -i '/MySQLTopologyUser/c\ \"MySQLTopologyUser\" : \"'"$DB_USER"'\",' /vt/orchestrator/tmp.json
30-
sed -i '/MySQLTopologyPassword/c\ \"MySQLTopologyPassword\" : \"'"$DB_PASS"'\",' /vt/orchestrator/tmp.json
31-
sed -i '/MySQLReplicaUser/c\ \"MySQLReplicaUser\" : \"'"$DB_USER"'\",' /vt/orchestrator/tmp.json
32-
sed -i '/MySQLReplicaPassword/c\ \"MySQLReplicaPassword\" : \"'"$DB_PASS"'\",' /vt/orchestrator/tmp.json
33-
cat /vt/orchestrator/tmp.json
34-
cp /vt/orchestrator/tmp.json /vt/orchestrator/config.json
28+
cp /vt/vtorc/default.json /vt/vtorc/tmp.json
29+
sed -i '/MySQLTopologyUser/c\ \"MySQLTopologyUser\" : \"'"$DB_USER"'\",' /vt/vtorc/tmp.json
30+
sed -i '/MySQLTopologyPassword/c\ \"MySQLTopologyPassword\" : \"'"$DB_PASS"'\",' /vt/vtorc/tmp.json
31+
sed -i '/MySQLReplicaUser/c\ \"MySQLReplicaUser\" : \"'"$DB_USER"'\",' /vt/vtorc/tmp.json
32+
sed -i '/MySQLReplicaPassword/c\ \"MySQLReplicaPassword\" : \"'"$DB_PASS"'\",' /vt/vtorc/tmp.json
33+
cat /vt/vtorc/tmp.json
34+
cp /vt/vtorc/tmp.json /vt/vtorc/config.json
3535
else
36-
cp /vt/orchestrator/default.json /vt/orchestrator/config.json
36+
cp /vt/vtorc/default.json /vt/vtorc/config.json
3737
fi
3838

3939
echo "Starting vtorc..."
4040
exec /vt/bin/vtorc \
4141
$TOPOLOGY_FLAGS \
4242
--logtostderr=true \
43-
--orc_web_dir=/vt/web/orchestrator \
43+
--orc_web_dir=/vt/web/vtorc \
4444
--config $config

‎examples/compose/orchestrator/default.json ‎examples/compose/vtorc/default.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"MySQLReplicaUser": "vt_repl",
88
"MySQLReplicaPassword": "",
99
"BackendDB": "sqlite",
10-
"SQLite3DataFile": "/tmp/orchestrator.sqlite3",
10+
"SQLite3DataFile": "/tmp/vtorc.sqlite3",
1111
"RecoverMasterClusterFilters": ["*"],
1212
"RecoveryPeriodBlockSeconds": 5,
1313
"DelayMasterPromotionIfSQLThreadNotUpToDate": true

‎examples/local/scripts/vtorc-up.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source ./env.sh
44

55
log_dir="${VTDATAROOT}/tmp"
6-
web_dir="../../web/orchestrator"
6+
web_dir="../../web/vtorc"
77
vtorc_web_port=16000
88

99
vtorc \

‎examples/region_sharding/scripts/vtorc-up.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source ./env.sh
44

55
log_dir="${VTDATAROOT}/tmp"
6-
web_dir="../../web/orchestrator"
6+
web_dir="../../web/vtorc"
77
vtorc_web_port=16000
88

99
vtorc \

‎go/cmd/vtorc/main.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ import (
3030
"vitess.io/vitess/go/vt/log"
3131
vtlog "vitess.io/vitess/go/vt/log"
3232
"vitess.io/vitess/go/vt/logutil"
33-
"vitess.io/vitess/go/vt/orchestrator/app"
34-
"vitess.io/vitess/go/vt/orchestrator/config"
35-
"vitess.io/vitess/go/vt/orchestrator/inst"
3633
"vitess.io/vitess/go/vt/servenv"
34+
"vitess.io/vitess/go/vt/vtorc/app"
35+
"vitess.io/vitess/go/vt/vtorc/config"
36+
"vitess.io/vitess/go/vt/vtorc/inst"
3737
)
3838

3939
var (
@@ -136,7 +136,7 @@ func main() {
136136
config.RuntimeCLIFlags.GrabElection = fs.Bool("grab-election", false, "Grab leadership (only applies to continuous mode)")
137137
config.RuntimeCLIFlags.PromotionRule = fs.String("promotion-rule", "prefer", "Promotion rule for register-andidate (prefer|neutral|prefer_not|must_not)")
138138
config.RuntimeCLIFlags.SkipContinuousRegistration = fs.Bool("skip-continuous-registration", false, "Skip cli commands performaing continuous registration (to reduce orchestratrator backend db load")
139-
config.RuntimeCLIFlags.EnableDatabaseUpdate = fs.Bool("enable-database-update", false, "Enable database update, overrides SkipOrchestratorDatabaseUpdate")
139+
config.RuntimeCLIFlags.EnableDatabaseUpdate = fs.Bool("enable-database-update", false, "Enable database update, overrides SkipVTOrcDatabaseUpdate")
140140
config.RuntimeCLIFlags.IgnoreRaftSetup = fs.Bool("ignore-raft-setup", false, "Override RaftEnabled for CLI invocation (CLI by default not allowed for raft setups). NOTE: operations by CLI invocation may not reflect in all raft nodes.")
141141
config.RuntimeCLIFlags.Tag = fs.String("tag", "", "tag to add ('tagname' or 'tagname=tagvalue') or to search ('tagname' or 'tagname=tagvalue' or comma separated 'tag0,tag1=val1,tag2' for intersection of all)")
142142

@@ -175,7 +175,7 @@ Please update your scripts before the next version, when this will begin to brea
175175
*destination = *sibling
176176
}
177177

178-
startText := "starting orchestrator"
178+
startText := "starting vtorc"
179179
if AppVersion != "" {
180180
startText += ", version: " + AppVersion
181181
}
@@ -187,7 +187,7 @@ Please update your scripts before the next version, when this will begin to brea
187187
if len(*configFile) > 0 {
188188
config.ForceRead(*configFile)
189189
} else {
190-
config.Read("/etc/orchestrator.conf.json", "conf/orchestrator.conf.json", "orchestrator.conf.json")
190+
config.Read("/etc/vtorc.conf.json", "conf/vtorc.conf.json", "vtorc.conf.json")
191191
}
192192
if *config.RuntimeCLIFlags.EnableDatabaseUpdate {
193193
config.Config.SkipOrchestratorDatabaseUpdate = false

‎go/test/endtoend/cluster/cluster_process.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ type LocalProcessCluster struct {
101101
VtctldProcess VtctldProcess
102102
VtgateProcess VtgateProcess
103103
VtbackupProcess VtbackupProcess
104-
VtorcProcesses []*VtorcProcess
104+
VTOrcProcesses []*VTOrcProcess
105105

106106
nextPortForProcess int
107107

@@ -842,7 +842,7 @@ func (cluster *LocalProcessCluster) Teardown() {
842842
log.Errorf("Error in vtgate teardown: %v", err)
843843
}
844844

845-
for _, vtorcProcess := range cluster.VtorcProcesses {
845+
for _, vtorcProcess := range cluster.VTOrcProcesses {
846846
if err := vtorcProcess.TearDown(); err != nil {
847847
log.Errorf("Error in vtorc teardown: %v", err)
848848
}
@@ -1051,11 +1051,11 @@ func (cluster *LocalProcessCluster) NewVttabletInstance(tabletType string, UID i
10511051
}
10521052
}
10531053

1054-
// NewOrcProcess creates a new VtorcProcess object
1055-
func (cluster *LocalProcessCluster) NewOrcProcess(config VtorcConfiguration) *VtorcProcess {
1054+
// NewVTOrcProcess creates a new VTOrcProcess object
1055+
func (cluster *LocalProcessCluster) NewVTOrcProcess(config VTOrcConfiguration) *VTOrcProcess {
10561056
base := VtctlProcessInstance(cluster.TopoProcess.Port, cluster.Hostname)
10571057
base.Binary = "vtorc"
1058-
return &VtorcProcess{
1058+
return &VTOrcProcess{
10591059
VtctlProcess: *base,
10601060
LogDir: cluster.TmpDirectory,
10611061
Config: config,

‎go/test/endtoend/cluster/vtorc_process.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ import (
3030
"vitess.io/vitess/go/vt/log"
3131
)
3232

33-
// VtorcProcess is a test struct for running
33+
// VTOrcProcess is a test struct for running
3434
// vtorc as a separate process for testing
35-
type VtorcProcess struct {
35+
type VTOrcProcess struct {
3636
VtctlProcess
3737
LogDir string
3838
ExtraArgs []string
3939
ConfigPath string
40-
Config VtorcConfiguration
40+
Config VTOrcConfiguration
4141
WebPort int
4242
proc *exec.Cmd
4343
exit chan error
4444
}
4545

46-
type VtorcConfiguration struct {
46+
type VTOrcConfiguration struct {
4747
Debug bool
4848
ListenAddress string
4949
MySQLTopologyUser string
@@ -59,12 +59,12 @@ type VtorcConfiguration struct {
5959
}
6060

6161
// ToJSONString will marshal this configuration as JSON
62-
func (config *VtorcConfiguration) ToJSONString() string {
62+
func (config *VTOrcConfiguration) ToJSONString() string {
6363
b, _ := json.MarshalIndent(config, "", "\t")
6464
return string(b)
6565
}
6666

67-
func (config *VtorcConfiguration) AddDefaults(webPort int) {
67+
func (config *VTOrcConfiguration) AddDefaults(webPort int) {
6868
config.Debug = true
6969
config.MySQLTopologyUser = "orc_client_user"
7070
config.MySQLTopologyPassword = "orc_client_user_password"
@@ -78,7 +78,7 @@ func (config *VtorcConfiguration) AddDefaults(webPort int) {
7878
}
7979

8080
// Setup starts orc process with required arguements
81-
func (orc *VtorcProcess) Setup() (err error) {
81+
func (orc *VTOrcProcess) Setup() (err error) {
8282

8383
// create the configuration file
8484
timeNow := time.Now().UnixNano()
@@ -99,15 +99,15 @@ func (orc *VtorcProcess) Setup() (err error) {
9999

100100
/* minimal command line arguments:
101101
$ vtorc -topo_implementation etcd2 -topo_global_server_address localhost:2379 -topo_global_root /vitess/global
102-
-config config/orchestrator/default.json -alsologtostderr http
102+
-config config/vtorc/default.json -alsologtostderr http
103103
*/
104104
orc.proc = exec.Command(
105105
orc.Binary,
106106
"--topo_implementation", orc.TopoImplementation,
107107
"--topo_global_server_address", orc.TopoGlobalAddress,
108108
"--topo_global_root", orc.TopoGlobalRoot,
109109
"--config", orc.ConfigPath,
110-
"--orc_web_dir", path.Join(os.Getenv("VTROOT"), "web", "orchestrator"),
110+
"--orc_web_dir", path.Join(os.Getenv("VTROOT"), "web", "vtorc"),
111111
)
112112
if *isCoverage {
113113
orc.proc.Args = append(orc.proc.Args, "--test.coverprofile="+getCoveragePath("orc.out"))
@@ -139,7 +139,7 @@ func (orc *VtorcProcess) Setup() (err error) {
139139
}
140140

141141
// TearDown shuts down the running vtorc service
142-
func (orc *VtorcProcess) TearDown() error {
142+
func (orc *VTOrcProcess) TearDown() error {
143143
if orc.proc == nil || orc.exit == nil {
144144
return nil
145145
}

‎go/test/endtoend/vtorc/general/main_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"vitess.io/vitess/go/test/endtoend/vtorc/utils"
2626
)
2727

28-
var clusterInfo *utils.VtOrcClusterInfo
28+
var clusterInfo *utils.VTOrcClusterInfo
2929

3030
func TestMain(m *testing.M) {
3131
// setup cellInfos before creating the cluster
@@ -52,7 +52,7 @@ func TestMain(m *testing.M) {
5252
if clusterInfo != nil {
5353
// stop vtorc first otherwise its logs get polluted
5454
// with instances being unreachable triggering unnecessary operations
55-
for _, vtorcProcess := range clusterInfo.ClusterInstance.VtorcProcesses {
55+
for _, vtorcProcess := range clusterInfo.ClusterInstance.VTOrcProcesses {
5656
_ = vtorcProcess.TearDown()
5757
}
5858

0 commit comments

Comments
 (0)