Skip to content

fix(pulsar): increase wait strategy deadlines to fix random test time… #3600

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

Draft
ljluestc wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −5
Draft

fix(pulsar): increase wait strategy deadlines to fix random test time… #3600

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
11 changes: 6 additions & 5 deletions modules/pulsar/pulsar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"io"
"net"
"strings"
"time"

"github.com/docker/go-connections/nat"

Expand All @@ -22,7 +23,7 @@ const (
)

var defaultWaitStrategies = []wait.Strategy{
wait.ForHTTP("/admin/v2/clusters").WithPort(defaultPulsarAdminPort).WithResponseMatcher(func(r io.Reader) bool {
wait.ForHTTP("/admin/v2/clusters").WithPort(defaultPulsarAdminPort).WithStartupTimeout(2 * time.Minute).WithResponseMatcher(func(r io.Reader) bool {
respBytes, _ := io.ReadAll(r)
resp := string(respBytes)
return resp == `["standalone"]`
Expand Down Expand Up @@ -80,7 +81,7 @@ func WithFunctionsWorker() testcontainers.CustomizeRequestOption {
ss = append(ss, wait.ForLog("Function worker service started"))
ss = append(ss, defaultWaitStrategies...)

return testcontainers.WithWaitStrategy(ss...)(req)
return testcontainers.WithWaitStrategyAndDeadline(3*time.Minute, ss...)(req)
}
}

Expand Down Expand Up @@ -113,12 +114,12 @@ func WithTransactions() testcontainers.CustomizeRequestOption {

// clone defaultWaitStrategies
ss := make([]wait.Strategy, 0, 1+len(defaultWaitStrategies))
ss = append(ss, wait.ForHTTP(transactionTopicEndpoint).WithPort(defaultPulsarAdminPort).WithStatusCodeMatcher(func(statusCode int) bool {
ss = append(ss, wait.ForHTTP(transactionTopicEndpoint).WithPort(defaultPulsarAdminPort).WithStartupTimeout(2*time.Minute).WithStatusCodeMatcher(func(statusCode int) bool {
return statusCode == 200
}))
ss = append(ss, defaultWaitStrategies...)

return testcontainers.WithWaitStrategy(ss...)(req)
return testcontainers.WithWaitStrategyAndDeadline(2*time.Minute, ss...)(req)
}
}

Expand All @@ -141,7 +142,7 @@ func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustom
moduleOpts := make([]testcontainers.ContainerCustomizer, 0, 3+len(opts))
moduleOpts = append(moduleOpts,
testcontainers.WithExposedPorts(defaultPulsarPort, defaultPulsarAdminPort),
testcontainers.WithWaitStrategy(defaultWaitStrategies...),
testcontainers.WithWaitStrategyAndDeadline(2*time.Minute, defaultWaitStrategies...),
testcontainers.WithCmd("/bin/bash", "-c", strings.Join([]string{defaultPulsarCmd, defaultPulsarCmdWithoutFunctionsWorker}, " ")),
)

Expand Down