Skip to content

Added Consul and Zk2 topo support in Go Cluster endtoend tests #5738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepthi merged 10 commits into from
Jan 29, 2020
+374 −226
Merged

Added Consul and Zk2 topo support in Go Cluster endtoend tests #5738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b9aa9ac
first commit to use zk in tests
ajeetj Jan 15, 2020
2a506f7
Fixed zookeeper and added consul
ajeetj Jan 17, 2020
82c7765
added consul setup
ajeetj Jan 20, 2020
22714db
added consul and zk2 tabletmanager tests in config
ajeetj Jan 20, 2020
526cfc0
Minor edits
ajeetj Jan 20, 2020
c2c5400
fixing verticalspli test
ajeetj Jan 21, 2020
860f660
Moving tabletmanager test to shard 18
ajeetj Jan 21, 2020
d267736
fixed reparent test
ajeetj Jan 21, 2020
081f8cd
Removing unrequired changes
ajeetj Jan 21, 2020
eb598cd
review comments addressed
ajeetj Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cluster_endtoend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
name: [11, 12, 13, 14, 15, 16, 17]
name: [11, 12, 13, 14, 15, 16, 17, 18]

steps:
- name: Set up Go
Expand Down
37 changes: 21 additions & 16 deletions go/test/endtoend/cluster/cluster_process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ const (
)

var (
keepData = flag.Bool("keep-data", false, "don't delete the per-test VTDATAROOT subfolders")
keepData = flag.Bool("keep-data", false, "don't delete the per-test VTDATAROOT subfolders")
topoFlavor = flag.String("topo-flavor", "etcd2", "choose a topo server from etcd2, zk2 or consul")
)

// LocalProcessCluster Testcases need to use this to iniate a cluster
Expand All @@ -60,7 +61,7 @@ type LocalProcessCluster struct {
VtctlProcess VtctlProcess

// background executable processes
TopoProcess EtcdProcess
TopoProcess TopoProcess
VtctldProcess VtctldProcess
VtgateProcess VtgateProcess
VtworkerProcess VtworkerProcess
Expand Down Expand Up @@ -140,22 +141,25 @@ func (cluster *LocalProcessCluster) StartTopo() (err error) {
}
cluster.TopoPort = cluster.GetAndReservePort()
cluster.TmpDirectory = path.Join(os.Getenv("VTDATAROOT"), fmt.Sprintf("/tmp_%d", cluster.GetAndReservePort()))
cluster.TopoProcess = *EtcdProcessInstance(cluster.TopoPort, cluster.GetAndReservePort(), cluster.Hostname, "global")
log.Info(fmt.Sprintf("Starting etcd server on port : %d", cluster.TopoPort))
if err = cluster.TopoProcess.Setup(); err != nil {
log.Error(err.Error())
return
}
cluster.TopoProcess = *TopoProcessInstance(cluster.TopoPort, cluster.GetAndReservePort(), cluster.Hostname, *topoFlavor, "global")

log.Info("Creating topo dirs")
if err = cluster.TopoProcess.ManageTopoDir("mkdir", "/vitess/global"); err != nil {
log.Info(fmt.Sprintf("Starting topo server %v on port : %d", topoFlavor, cluster.TopoPort))
if err = cluster.TopoProcess.Setup(*topoFlavor, cluster); err != nil {
log.Error(err.Error())
return
}

if err = cluster.TopoProcess.ManageTopoDir("mkdir", "/vitess/"+cluster.Cell); err != nil {
log.Error(err.Error())
return
if *topoFlavor == "etcd2" {
log.Info("Creating topo dirs")
if err = cluster.TopoProcess.ManageTopoDir("mkdir", "/vitess/global"); err != nil {
log.Error(err.Error())
return
}

if err = cluster.TopoProcess.ManageTopoDir("mkdir", "/vitess/"+cluster.Cell); err != nil {
log.Error(err.Error())
return
}
}

log.Info("Adding cell info")
Expand All @@ -165,7 +169,8 @@ func (cluster *LocalProcessCluster) StartTopo() (err error) {
return
}

cluster.VtctldProcess = *VtctldProcessInstance(cluster.GetAndReservePort(), cluster.GetAndReservePort(), cluster.TopoProcess.Port, cluster.Hostname, cluster.TmpDirectory)
cluster.VtctldProcess = *VtctldProcessInstance(cluster.GetAndReservePort(), cluster.GetAndReservePort(),
cluster.TopoProcess.Port, cluster.Hostname, cluster.TmpDirectory)
log.Info(fmt.Sprintf("Starting vtctld server on port : %d", cluster.VtctldProcess.Port))
cluster.VtctldHTTPPort = cluster.VtctldProcess.Port
if err = cluster.VtctldProcess.Setup(cluster.Cell, cluster.VtctldExtraArgs...); err != nil {
Expand Down Expand Up @@ -479,8 +484,8 @@ func (cluster *LocalProcessCluster) Teardown() {
log.Errorf("Error in vtctld teardown - %s", err.Error())
}

if err := cluster.TopoProcess.TearDown(cluster.Cell, cluster.OriginalVTDATAROOT, cluster.CurrentVTDATAROOT, *keepData); err != nil {
log.Errorf("Error in etcd teardown - %s", err.Error())
if err := cluster.TopoProcess.TearDown(cluster.Cell, cluster.OriginalVTDATAROOT, cluster.CurrentVTDATAROOT, *keepData, *topoFlavor); err != nil {
log.Errorf("Error in topo server teardown - %s", err.Error())
}
}

Expand Down
179 changes: 0 additions & 179 deletions go/test/endtoend/cluster/etcd_process.go
View file
Open in desktop

This file was deleted.

Loading