Skip to content

Create a single MySQL instance when multiple keyspaces are defined #96

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

Open
frouioui wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Create a single MySQL instance when multiple keyspaces are defined #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions go/tester/execute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@ func SetupCluster(cfg Config) (_ ClusterInfo, err error) {
vtParams := clusterInstance.GetVTParams(ksNames[0])

var mysqlParams *mysql.ConnParams
var closers []func()
var closer func()
if cfg.Compare {
mysqlParams, closers, err = setupExternalMySQL(keyspaces, clusterInstance)
mysqlParams, closer, err = setupExternalMySQL(keyspaces, clusterInstance)
if err != nil {
return ClusterInfo{}, err
}
Expand All @@ -135,7 +135,7 @@ func SetupCluster(cfg Config) (_ ClusterInfo, err error) {
vschema: vschema,
closer: func() {
clusterInstance.Teardown()
for _, closer := range closers {
if closer != nil {
closer()
}
},
Expand Down Expand Up @@ -165,8 +165,7 @@ func startKeyspace(cfg Config, vschema *vindexes.VSchema, keyspace *cluster.Keys
return nil
}

// TODO: having a single connection is not correct if we are dealing with multiple mysql databases.
func setupExternalMySQL(keyspaces []*cluster.Keyspace, clusterInstance *cluster.LocalProcessCluster) (_ *mysql.ConnParams, closers []func(), err error) {
func setupExternalMySQL(keyspaces []*cluster.Keyspace, clusterInstance *cluster.LocalProcessCluster) (_ *mysql.ConnParams, closer func(), err error) {
// Create the mysqld server we will use to compare the results.
// We go through all the keyspaces we found in the vschema, and
// simply create the mysqld process during the first iteration with
Expand All @@ -185,9 +184,9 @@ func setupExternalMySQL(keyspaces []*cluster.Keyspace, clusterInstance *cluster.
if err != nil {
return nil, nil, err
}
continue
}

var closer func()
mysqlParamsValue, closer, err = utils.NewMySQL(clusterInstance, keyspace.Name, "")
if err != nil {
return nil, nil, err
Expand All @@ -196,9 +195,8 @@ func setupExternalMySQL(keyspaces []*cluster.Keyspace, clusterInstance *cluster.
if err != nil {
return nil, nil, err
}
closers = append(closers, closer)
}
return &mysqlParamsValue, closers, nil
return &mysqlParamsValue, closer, nil
}

func generateShardRanges(numberOfShards int) []string {
Expand Down
Loading