Skip to content

[release-17.0] backport mysqlctl CLI compatibility fix to 17.0 #14082

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
ajm188 merged 2 commits into from
Sep 22, 2023
Merged

[release-17.0] backport mysqlctl CLI compatibility fix to 17.0 #14082

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f74c5ad
backwards compat handling for upgrade/downgrade tests
Sep 20, 2023
a7cc9f3
send only one command, not two
Sep 22, 2023
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
26 changes: 22 additions & 4 deletions go/test/endtoend/cluster/mysqlctl_process.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,21 @@ type MysqlctlProcess struct {
ExtraArgs []string
InitMysql bool
SecureTransport bool
MajorVersion int
}

// InitDb executes mysqlctl command to add cell info
func (mysqlctl *MysqlctlProcess) InitDb() (err error) {
args := []string{"--log_dir", mysqlctl.LogDirectory,
"--tablet_uid", fmt.Sprintf("%d", mysqlctl.TabletUID),
"--mysql_port", fmt.Sprintf("%d", mysqlctl.MySQLPort),
"init", "--",
"--init_db_sql_file", mysqlctl.InitDBFile}
"init",
}
if mysqlctl.MajorVersion < 18 {
args = append(args, "--")
}

args = append(args, "--init_db_sql_file", mysqlctl.InitDBFile)
if *isCoverage {
args = append([]string{"--test.coverprofile=" + getCoveragePath("mysql-initdb.out"), "--test.v"}, args...)
}
Expand Down Expand Up @@ -143,8 +149,14 @@ ssl_key={{.ServerKey}}
}

if init {
tmpProcess.Args = append(tmpProcess.Args, "init", "--",
"--init_db_sql_file", mysqlctl.InitDBFile)
tmpProcess.Args = append(tmpProcess.Args, "init")
if mysqlctl.MajorVersion < 18 {
tmpProcess.Args = append(tmpProcess.Args, "--")
}

tmpProcess.Args = append(tmpProcess.Args, "--init_db_sql_file", mysqlctl.InitDBFile)
} else {
tmpProcess.Args = append(tmpProcess.Args, "start")
}
}
tmpProcess.Args = append(tmpProcess.Args, "start")
Expand Down Expand Up @@ -238,11 +250,17 @@ func MysqlCtlProcessInstanceOptionalInit(tabletUID int, mySQLPort int, tmpDirect
if err != nil {
return nil, err
}

version, err := GetMajorVersion("mysqlctl")
if err != nil {
log.Warningf("failed to get major mysqlctl version; backwards-compatibility for CLI changes may not work: %s", err)
}
mysqlctl := &MysqlctlProcess{
Name: "mysqlctl",
Binary: "mysqlctl",
LogDirectory: tmpDirectory,
InitDBFile: initFile,
MajorVersion: version,
}
mysqlctl.MySQLPort = mySQLPort
mysqlctl.TabletUID = tabletUID
Expand Down