-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
moved timeout test to different package (#14028)
Signed-off-by: Harshit Gangal <[email protected]>
- Loading branch information
1 parent
371c8ff
commit b847161
Showing
8 changed files
with
251 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| Copyright 2022 The Vitess Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package misc | ||
|
|
||
| import ( | ||
| _ "embed" | ||
| "flag" | ||
| "fmt" | ||
| "os" | ||
| "testing" | ||
|
|
||
| "vitess.io/vitess/go/test/endtoend/utils" | ||
|
|
||
| "vitess.io/vitess/go/mysql" | ||
| "vitess.io/vitess/go/test/endtoend/cluster" | ||
| ) | ||
|
|
||
| var ( | ||
| clusterInstance *cluster.LocalProcessCluster | ||
| vtParams mysql.ConnParams | ||
| mysqlParams mysql.ConnParams | ||
| keyspaceName = "ks_misc" | ||
| uks = "uks" | ||
| cell = "test_misc" | ||
|
|
||
| //go:embed uschema.sql | ||
| uschemaSQL string | ||
|
|
||
| //go:embed schema.sql | ||
| schemaSQL string | ||
|
|
||
| //go:embed vschema.json | ||
| vschema string | ||
| ) | ||
|
|
||
| func TestMain(m *testing.M) { | ||
| defer cluster.PanicHandler(nil) | ||
| flag.Parse() | ||
|
|
||
| exitCode := func() int { | ||
| clusterInstance = cluster.NewCluster(cell, "localhost") | ||
| defer clusterInstance.Teardown() | ||
|
|
||
| // Start topo server | ||
| err := clusterInstance.StartTopo() | ||
| if err != nil { | ||
| return 1 | ||
| } | ||
|
|
||
| clusterInstance.VtTabletExtraArgs = append(clusterInstance.VtTabletExtraArgs, | ||
| "--queryserver-config-max-result-size", "1000000", | ||
| "--queryserver-config-query-timeout", "200", | ||
| "--queryserver-config-query-pool-timeout", "200") | ||
| // Start Unsharded keyspace | ||
| ukeyspace := &cluster.Keyspace{ | ||
| Name: uks, | ||
| SchemaSQL: uschemaSQL, | ||
| } | ||
| err = clusterInstance.StartUnshardedKeyspace(*ukeyspace, 0, false) | ||
| if err != nil { | ||
| return 1 | ||
| } | ||
|
|
||
| // Start keyspace | ||
| keyspace := &cluster.Keyspace{ | ||
| Name: keyspaceName, | ||
| SchemaSQL: schemaSQL, | ||
| VSchema: vschema, | ||
| } | ||
| err = clusterInstance.StartKeyspace(*keyspace, []string{"-80", "80-"}, 0, false) | ||
| if err != nil { | ||
| return 1 | ||
| } | ||
|
|
||
| clusterInstance.VtGateExtraArgs = append(clusterInstance.VtGateExtraArgs, | ||
| "--query-timeout", "100") | ||
| // Start vtgate | ||
| err = clusterInstance.StartVtgate() | ||
| if err != nil { | ||
| return 1 | ||
| } | ||
|
|
||
| vtParams = clusterInstance.GetVTParams(keyspaceName) | ||
|
|
||
| // create mysql instance and connection parameters | ||
| conn, closer, err := utils.NewMySQL(clusterInstance, keyspaceName, schemaSQL) | ||
| if err != nil { | ||
| fmt.Println(err) | ||
| return 1 | ||
| } | ||
| defer closer() | ||
| mysqlParams = conn | ||
| return m.Run() | ||
| }() | ||
| os.Exit(exitCode) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| create table if not exists t1( | ||
| id1 bigint, | ||
| id2 bigint, | ||
| primary key(id1) | ||
| ) Engine=InnoDB; |
100 changes: 100 additions & 0 deletions
100
go/test/endtoend/vtgate/queries/timeout/timeout_test.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| Copyright 2022 The Vitess Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package misc | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| _ "github.com/go-sql-driver/mysql" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "vitess.io/vitess/go/test/endtoend/cluster" | ||
| "vitess.io/vitess/go/test/endtoend/utils" | ||
| ) | ||
|
|
||
| func start(t *testing.T) (utils.MySQLCompare, func()) { | ||
| mcmp, err := utils.NewMySQLCompare(t, vtParams, mysqlParams) | ||
| require.NoError(t, err) | ||
|
|
||
| deleteAll := func() { | ||
| tables := []string{"t1", "uks.unsharded"} | ||
| for _, table := range tables { | ||
| _, _ = mcmp.ExecAndIgnore("delete from " + table) | ||
| } | ||
| } | ||
|
|
||
| deleteAll() | ||
|
|
||
| return mcmp, func() { | ||
| deleteAll() | ||
| mcmp.Close() | ||
| cluster.PanicHandler(t) | ||
| } | ||
| } | ||
|
|
||
| func TestQueryTimeoutWithDual(t *testing.T) { | ||
| mcmp, closer := start(t) | ||
| defer closer() | ||
|
|
||
| _, err := utils.ExecAllowError(t, mcmp.VtConn, "select sleep(0.04) from dual") | ||
| assert.NoError(t, err) | ||
| _, err = utils.ExecAllowError(t, mcmp.VtConn, "select sleep(0.24) from dual") | ||
| assert.Error(t, err) | ||
| _, err = utils.ExecAllowError(t, mcmp.VtConn, "set @@session.query_timeout=20") | ||
| require.NoError(t, err) | ||
| _, err = utils.ExecAllowError(t, mcmp.VtConn, "select sleep(0.04) from dual") | ||
| assert.Error(t, err) | ||
| _, err = utils.ExecAllowError(t, mcmp.VtConn, "select sleep(0.01) from dual") | ||
| assert.NoError(t, err) | ||
| _, err = utils.ExecAllowError(t, mcmp.VtConn, "select /*vt+ QUERY_TIMEOUT_MS=500 */ sleep(0.24) from dual") | ||
| assert.NoError(t, err) | ||
| _, err = utils.ExecAllowError(t, mcmp.VtConn, "select /*vt+ QUERY_TIMEOUT_MS=10 */ sleep(0.04) from dual") | ||
| assert.Error(t, err) | ||
| _, err = utils.ExecAllowError(t, mcmp.VtConn, "select /*vt+ QUERY_TIMEOUT_MS=15 */ sleep(0.001) from dual") | ||
| assert.NoError(t, err) | ||
| } | ||
|
|
||
| func TestQueryTimeoutWithTables(t *testing.T) { | ||
| mcmp, closer := start(t) | ||
| defer closer() | ||
|
|
||
| // unsharded | ||
| utils.Exec(t, mcmp.VtConn, "insert /*vt+ QUERY_TIMEOUT_MS=1000 */ into uks.unsharded(id1) values (1),(2),(3),(4),(5)") | ||
| for i := 0; i < 12; i++ { | ||
| utils.Exec(t, mcmp.VtConn, "insert /*vt+ QUERY_TIMEOUT_MS=2000 */ into uks.unsharded(id1) select id1+5 from uks.unsharded") | ||
| } | ||
|
|
||
| utils.Exec(t, mcmp.VtConn, "select count(*) from uks.unsharded where id1 > 31") | ||
| utils.Exec(t, mcmp.VtConn, "select /*vt+ QUERY_TIMEOUT_MS=100 */ count(*) from uks.unsharded where id1 > 31") | ||
|
|
||
| // the query usually takes more than 5ms to return. So this should fail. | ||
| _, err := utils.ExecAllowError(t, mcmp.VtConn, "select /*vt+ QUERY_TIMEOUT_MS=1 */ count(*) from uks.unsharded where id1 > 31") | ||
| require.Error(t, err) | ||
| assert.Contains(t, err.Error(), "context deadline exceeded") | ||
| assert.Contains(t, err.Error(), "(errno 1317) (sqlstate 70100)") | ||
|
|
||
| // sharded | ||
| utils.Exec(t, mcmp.VtConn, "insert /*vt+ QUERY_TIMEOUT_MS=1000 */ into ks_misc.t1(id1, id2) values (1,2),(2,4),(3,6),(4,8),(5,10)") | ||
|
|
||
| // sleep take in seconds, so 0.1 is 100ms | ||
| utils.Exec(t, mcmp.VtConn, "select /*vt+ QUERY_TIMEOUT_MS=500 */ sleep(0.1) from t1 where id1 = 1") | ||
| _, err = utils.ExecAllowError(t, mcmp.VtConn, "select /*vt+ QUERY_TIMEOUT_MS=20 */ sleep(0.1) from t1 where id1 = 1") | ||
| require.Error(t, err) | ||
| assert.Contains(t, err.Error(), "context deadline exceeded") | ||
| assert.Contains(t, err.Error(), "(errno 1317) (sqlstate 70100)") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| create table unsharded( | ||
| id1 bigint, | ||
| id2 bigint, | ||
| key(id1) | ||
| ) Engine=InnoDB; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "sharded": true, | ||
| "vindexes": { | ||
| "hash": { | ||
| "type": "hash" | ||
| } | ||
| }, | ||
| "tables": { | ||
| "t1": { | ||
| "column_vindexes": [ | ||
| { | ||
| "column": "id1", | ||
| "name": "hash" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters