Skip to content

Vreplication Cross-cell source: add support for cells in reshard #6456

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 4 commits into from
Jul 22, 2020
Merged

Vreplication Cross-cell source: add support for cells in reshard #6456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5ed5fa0
Vrepl Crosscell: add cell/tablettypes to reshard command
rohit-nayak-ps Jul 18, 2020
d5192f1
VRepl Cross-cell source: add cell/tablet_types for reshard, rename ce…
rohit-nayak-ps Jul 20, 2020
ac67c7b
Vrepl Crosscell: fix linter error, remove unused code
rohit-nayak-ps Jul 20, 2020
2513e1a
VRepl Crosscell: address review comments
rohit-nayak-ps Jul 22, 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
33 changes: 19 additions & 14 deletions go/test/endtoend/vreplication/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import (
"context"
"errors"
"fmt"
"math/rand"
"os"
"os/exec"
"path"
"strings"
"testing"
"time"
Expand All @@ -20,7 +22,8 @@ import (
)

var (
vtdataroot string
originalVtdataroot string
vtdataroot string
)

var globalConfig = struct {
Expand Down Expand Up @@ -81,9 +84,20 @@ type Tablet struct {
DbServer *cluster.MysqlctlProcess
}

func init() {
originalVtdataroot = os.Getenv("VTDATAROOT")
}

func initGlobals() {
vtdataroot = os.Getenv("VTDATAROOT")
rand.Seed(time.Now().UTC().UnixNano())
dirSuffix := 100000 + rand.Intn(999999-100000) // 6 digits
vtdataroot = path.Join(originalVtdataroot, fmt.Sprintf("vreple2e_%d", dirSuffix))
globalConfig.tmpDir = vtdataroot + "/tmp"
if _, err := os.Stat(vtdataroot); os.IsNotExist(err) {
os.Mkdir(vtdataroot, 0700)
}
_ = os.Setenv("VTDATAROOT", vtdataroot)
fmt.Printf("VTDATAROOT is %s\n", vtdataroot)
}

// NewVitessCluster creates an entire VitessCluster for e2e testing
Expand Down Expand Up @@ -186,7 +200,7 @@ func (vc *VitessCluster) AddTablet(t *testing.T, cell *Cell, keyspace *Keyspace,
vc.Topo.Port,
globalConfig.hostname,
globalConfig.tmpDir,
nil,
[]string{"-queryserver-config-schema-reload-time", "5"}, //FIXME: for multi-cell initial schema doesn't seem to load without this
false)
assert.NotNil(t, vttablet)
vttablet.SupportsBackup = false
Expand Down Expand Up @@ -345,16 +359,13 @@ func (vc *VitessCluster) TearDown() {
}
}
}
var dbProcesses []*exec.Cmd
for _, cell := range vc.Cells {
for _, keyspace := range cell.Keyspaces {
for _, shard := range keyspace.Shards {
for _, tablet := range shard.Tablets {
if tablet.DbServer != nil && tablet.DbServer.TabletUID > 0 {
if proc, err := tablet.DbServer.StopProcess(); err != nil {
if _, err := tablet.DbServer.StopProcess(); err != nil {
log.Errorf("Error stopping mysql process: %s", err.Error())
} else {
dbProcesses = append(dbProcesses, proc)
}
}
fmt.Printf("Stopping vttablet %s\n", tablet.Name)
Expand All @@ -366,18 +377,12 @@ func (vc *VitessCluster) TearDown() {
}
}

for _, proc := range dbProcesses {
if err := proc.Wait(); err != nil {
fmt.Printf("Error waiting for mysql to stop: %s\n", err.Error())
}
}

if err := vc.Vtctld.TearDown(); err != nil {
fmt.Printf("Error stopping Vtctld: %s\n", err.Error())
}

for _, cell := range vc.Cells {
if err := vc.Topo.TearDown(cell.Name, vtdataroot, vtdataroot, false, "etcd2"); err != nil {
if err := vc.Topo.TearDown(cell.Name, originalVtdataroot, vtdataroot, false, "etcd2"); err != nil {
fmt.Printf("Error in etcd teardown - %s\n", err.Error())
}
}
Expand Down
Loading