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

[v10] Try to fix TestAppServersHA flakiness #14004

Merged
merged 5 commits into from
Jul 3, 2022
Merged

[v10] Try to fix TestAppServersHA flakiness #14004

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4be6fd
Try to fix TestAppServersHA flakiness
smallinsky Jun 29, 2022
1e67dbf
Merge branch 'branch/v10' into bot/backport-13992-branch/v10
smallinsky Jun 30, 2022
c00730c
Merge branch 'branch/v10' into bot/backport-13992-branch/v10
smallinsky Jul 1, 2022
496dc0b
Fixed TestAppServersHA.
russjones Jun 30, 2022
7840290
Merge branch 'branch/v10' into bot/backport-13992-branch/v10
smallinsky Jul 2, 2022
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
17 changes: 15 additions & 2 deletions integration/app_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"

"github.com/gravitational/teleport"
"github.com/gravitational/teleport/api/breaker"
apidefaults "github.com/gravitational/teleport/api/defaults"
Expand Down Expand Up @@ -516,8 +517,9 @@ func (p *pack) appServersHA(t *testing.T) {
}

testCases := map[string]struct {
packInfo func(pack *pack) packInfo
startAppServers func(pack *pack, count int) []*service.TeleportProcess
packInfo func(pack *pack) packInfo
startAppServers func(pack *pack, count int) []*service.TeleportProcess
waitForTunnelConn func(t *testing.T, pack *pack, count int)
}{
"RootServer": {
packInfo: func(pack *pack) packInfo {
Expand All @@ -531,6 +533,9 @@ func (p *pack) appServersHA(t *testing.T) {
startAppServers: func(pack *pack, count int) []*service.TeleportProcess {
return pack.startRootAppServers(t, count, []service.App{})
},
waitForTunnelConn: func(t *testing.T, pack *pack, count int) {
waitForActiveTunnelConnections(t, pack.rootCluster.Tunnel, pack.rootCluster.Secrets.SiteName, count)
},
},
"LeafServer": {
packInfo: func(pack *pack) packInfo {
Expand All @@ -544,6 +549,9 @@ func (p *pack) appServersHA(t *testing.T) {
startAppServers: func(pack *pack, count int) []*service.TeleportProcess {
return pack.startLeafAppServers(t, count, []service.App{})
},
waitForTunnelConn: func(t *testing.T, pack *pack, count int) {
waitForActiveTunnelConnections(t, pack.leafCluster.Tunnel, pack.leafCluster.Secrets.SiteName, count)
},
},
}

Expand Down Expand Up @@ -588,6 +596,7 @@ func (p *pack) appServersHA(t *testing.T) {
// Stop all root app servers.
for i, appServer := range info.appServers {
require.NoError(t, appServer.Close())
require.NoError(t, appServer.Wait())

if i == len(info.appServers)-1 {
// fails only when the last one is closed.
Expand All @@ -600,13 +609,17 @@ func (p *pack) appServersHA(t *testing.T) {
}

servers := test.startAppServers(p, 1)
test.waitForTunnelConn(t, p, 1)
makeRequests(t, p, httpCookie, wsCookie, responseWithoutError)

// Start an additional app server and stop all current running
// ones.
test.startAppServers(p, 1)
test.waitForTunnelConn(t, p, 2)

for _, appServer := range servers {
require.NoError(t, appServer.Close())
require.NoError(t, appServer.Wait())

// Everytime an app server stops we issue a request to
// guarantee that the requests are going to be resolved by
Expand Down