Skip to content
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

Jump to bottom

Reset Session for Reserved Connection Query Failure #6673

Merged
merged 3 commits into from
Sep 9, 2020
Merged

Reset Session for Reserved Connection Query Failure #6673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ca1da7
reset session on connection close for reserved connection when not in…
harshit-gangal Sep 4, 2020
5517ae8
add e2e test
harshit-gangal Sep 4, 2020
1d64f21
check transaction ended error message on exec failure on reserved con…
harshit-gangal Sep 7, 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
1 change: 1 addition & 0 deletions go/test/endtoend/vtgate/setstatement/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ func TestMain(m *testing.M) {
SchemaSQL: sqlSchema,
VSchema: vSchema,
}
clusterInstance.VtTabletExtraArgs = []string{"-queryserver-config-transaction-timeout", "5"}
if err := clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 1, false); err != nil {
return 1
}
Expand Down
21 changes: 13 additions & 8 deletions go/test/endtoend/vtgate/setstatement/sysvar_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"fmt"
"testing"
"time"

"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/require"
Expand Down Expand Up @@ -164,8 +165,7 @@ func TestSetSystemVarWithTxFailure(t *testing.T) {
assertMatches(t, conn, `select @@sql_safe_updates`, `[[INT64(1)]]`)
}

func TestSetSystemVarWithConnectionFailure(t *testing.T) {
t.Skip("failing at the moment")
func TestSetSystemVarWithConnectionTimeout(t *testing.T) {
vtParams := mysql.ConnParams{
Host: "localhost",
Port: clusterInstance.VtgateMySQLPort,
Expand All @@ -178,15 +178,20 @@ func TestSetSystemVarWithConnectionFailure(t *testing.T) {

checkedExec(t, conn, "insert into test (id, val1) values (80, null)")
checkedExec(t, conn, "set sql_safe_updates = 1")
qr := checkedExec(t, conn, "select connection_id() from test where id = 80")
qr := checkedExec(t, conn, "select @@sql_safe_updates, connection_id() from test where id = 80")
require.Equal(t, "1", qr.Rows[0][0].ToString())

// kill the mysql connection shard which has transaction open.
vttablet1 := clusterInstance.Keyspaces[0].Shards[0].MasterTablet() // 80-
vttablet1.VttabletProcess.QueryTablet(fmt.Sprintf("kill %s", qr.Rows[0][0].ToString()), keyspaceName, false)
// Connection timeout.
time.Sleep(10 * time.Second)

// we still want to have our system setting applied
// first query will fail
_, err = exec(t, conn, `select @@sql_safe_updates from test where id = 80`)
require.NoError(t, err)
require.Error(t, err)

// this query is able to succeed.
newQR := checkedExec(t, conn, `select @@sql_safe_updates, connection_id() from test where id = 80`)
require.Equal(t, qr.Rows[0][0], newQR.Rows[0][0])
require.NotEqual(t, qr.Rows[0][1], newQR.Rows[0][1])
}

func TestSetSystemVariableAndThenSuccessfulTx(t *testing.T) {
Expand Down
5 changes: 4 additions & 1 deletion go/vt/vtgate/scatter_conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package vtgate
import (
"flag"
"io"
"regexp"
"sync"
"time"

Expand Down Expand Up @@ -241,10 +242,12 @@ func (stc *ScatterConn) ExecuteMultiShard(
return qr, allErrors.GetErrors()
}

var errRegx = regexp.MustCompile("transaction ([a-z0-9:]+) ended")

func checkAndResetShardSession(info *shardActionInfo, err error, session *SafeSession) {
if info.reservedID != 0 && info.transactionID == 0 {
sqlErr := mysql.NewSQLErrorFromError(err).(*mysql.SQLError)
if sqlErr.Number() == mysql.CRServerGone || sqlErr.Number() == mysql.CRServerLost {
if sqlErr.Number() == mysql.CRServerGone || sqlErr.Number() == mysql.CRServerLost || (sqlErr.Number() == mysql.ERQueryInterrupted && errRegx.Match([]byte(sqlErr.Error()))) {
session.ResetShard(info.alias)
}
}
Expand Down