Skip to content

Add flag for extending the transaction timeout in vttestserver #4763

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 1 commit into from
Mar 29, 2019
Merged

Add flag for extending the transaction timeout in vttestserver #4763

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions go/cmd/vttestserver/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ func parseFlags() (config vttest.Config, env vttest.Environment, err error) {
"A MySQL DB snapshot file")

flag.StringVar(&config.TransactionMode, "transaction_mode", "MULTI", "Transaction mode MULTI (default), SINGLE or TWOPC ")
flag.Float64Var(&config.TransactionTimeout, "queryserver-config-transaction-timeout", 0, "query server transaction timeout (in seconds), a transaction will be killed if it takes longer than this value")

flag.Parse()

Expand Down
2 changes: 2 additions & 0 deletions go/vt/vttest/local_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ type Config struct {

// TransactionMode is SINGLE, MULTI or TWOPC
TransactionMode string

TransactionTimeout float64
}

// InitSchemas is a shortcut for tests that just want to setup a single
Expand Down
3 changes: 3 additions & 0 deletions go/vt/vttest/vtprocess.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,9 @@ func VtcomboProcess(env Environment, args *Config, mysql MySQLManager) *VtProces
if args.TransactionMode != "" {
vt.ExtraArgs = append(vt.ExtraArgs, []string{"-transaction_mode", args.TransactionMode}...)
}
if args.TransactionTimeout != 0 {
vt.ExtraArgs = append(vt.ExtraArgs, "-queryserver-config-transaction-timeout", fmt.Sprintf("%f", args.TransactionTimeout))
}

if socket != "" {
vt.ExtraArgs = append(vt.ExtraArgs, []string{
Expand Down