Skip to content

Fix scale test errors caused by upstream server count #2439

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
merged 4 commits into from
Aug 23, 2024
Merged

Fix scale test errors caused by upstream server count #2439

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5451e6
Add test results
bjee19 Aug 21, 2024
644c81f
Add updated test results for verification
bjee19 Aug 22, 2024
cb98e79
Remove all results
bjee19 Aug 22, 2024
957568f
Refactor upstream test name to include both OSS and Plus server count
bjee19 Aug 22, 2024
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
22 changes: 17 additions & 5 deletions tests/suite/scale_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,16 @@ var _ = Describe("Scale test", Ordered, Label("nfr", "scale"), func() {
ngfPodName string
promInstance framework.PrometheusInstance
promPortForwardStopCh = make(chan struct{})

upstreamServerCount int32
)

const (
httpListenerCount = 64
httpsListenerCount = 64
httpRouteCount = 1000
upstreamServerCount = 648
httpListenerCount = 64
httpsListenerCount = 64
httpRouteCount = 1000
ossUpstreamServerCount = 648
plusUpstreamServerCount = 556
)

BeforeAll(func() {
Expand Down Expand Up @@ -85,6 +88,12 @@ var _ = Describe("Scale test", Ordered, Label("nfr", "scale"), func() {
if !clusterInfo.IsGKE {
Expect(promInstance.PortForward(k8sConfig, promPortForwardStopCh)).To(Succeed())
}

if *plusEnabled {
upstreamServerCount = plusUpstreamServerCount
} else {
upstreamServerCount = ossUpstreamServerCount
}
})

BeforeEach(func() {
Expand Down Expand Up @@ -563,7 +572,10 @@ The logs are attached only if there are errors.
)
})

It(fmt.Sprintf("scales upstream servers to %d", upstreamServerCount), func() {
It(fmt.Sprintf("scales upstream servers to %d for OSS and %d for Plus",
ossUpstreamServerCount,
plusUpstreamServerCount,
), func() {
const testName = "TestScale_UpstreamServers"

testResultsDir := filepath.Join(resultsDir, testName)
Expand Down
Loading