Skip to content

ensure tests for discoverygateway #6536

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
sougou merged 1 commit into from
Aug 5, 2020
Merged

ensure tests for discoverygateway #6536

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
12 changes: 6 additions & 6 deletions go/test/endtoend/cellalias/cell_alias_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ func TestMain(m *testing.M) {
return 1, err
}

shard1Master = localCluster.NewVttabletInstance("master", 0, "")
shard1Master = localCluster.NewVttabletInstance("master", 0, cell1)
shard1Replica = localCluster.NewVttabletInstance("replica", 0, cell2)
shard1Rdonly = localCluster.NewVttabletInstance("rdonly", 0, cell2)

shard2Master = localCluster.NewVttabletInstance("master", 0, "")
shard2Master = localCluster.NewVttabletInstance("master", 0, cell1)
shard2Replica = localCluster.NewVttabletInstance("replica", 0, cell2)
shard2Rdonly = localCluster.NewVttabletInstance("rdonly", 0, cell2)

Expand Down Expand Up @@ -256,6 +256,8 @@ func TestAlias(t *testing.T) {
vtgateInstance := localCluster.NewVtgateInstance()
vtgateInstance.CellsToWatch = allCells
vtgateInstance.TabletTypesToWait = "MASTER,REPLICA"
// Use legacy gateway. There's a separate test for tabletgateway in go/test/endtoend/tabletgateway/cellalias/cell_alias_test.go
vtgateInstance.GatewayImplementation = "discoverygateway"
err = vtgateInstance.Setup()
require.NoError(t, err)

Expand Down Expand Up @@ -309,14 +311,12 @@ func TestAddAliasWhileVtgateUp(t *testing.T) {

vtgateInstance := localCluster.NewVtgateInstance()
vtgateInstance.CellsToWatch = allCells
vtgateInstance.TabletTypesToWait = "MASTER,REPLICA,RDONLY"
vtgateInstance.GatewayImplementation = "discoverygateway"
// only MASTER is in vtgate's "cell", other tablet types are not visible because they are in the other cell
vtgateInstance.TabletTypesToWait = "MASTER"
err = vtgateInstance.Setup()
require.NoError(t, err)
defer vtgateInstance.TearDown()

waitTillAllTabletsAreHealthyInVtgate(t, *vtgateInstance, shard1.Name, shard2.Name)

// since replica and rdonly tablets of all shards in cell2, the last 2 assertion is expected to fail
testQueriesOnTabletType(t, "master", vtgateInstance.GrpcPort, false)
testQueriesOnTabletType(t, "replica", vtgateInstance.GrpcPort, true)
Expand Down
4 changes: 3 additions & 1 deletion go/test/endtoend/vtgate/buffer/buffer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,9 @@ func createCluster() (*cluster.LocalProcessCluster, int) {
// Long timeout in case failover is slow.
"-buffer_window", "10m",
"-buffer_max_failover_duration", "10m",
"-buffer_min_time_between_failovers", "20m"}
"-buffer_min_time_between_failovers", "20m",
// Use legacy gateway. tabletgateway test is at go/test/endtoend/tabletgateway/buffer/buffer_test.go
"-gateway_implementation", "discoverygateway"}

// Start vtgate
if err := clusterInstance.StartVtgate(); err != nil {
Expand Down