Add configurable timeouts and curate default timeout settings
This commit is contained in:
parent
d84ccbc52a
commit
14a0d66410
10 changed files with 460 additions and 76 deletions
38
integration/fixtures/timeout/forwarding_timeouts.toml
Normal file
38
integration/fixtures/timeout/forwarding_timeouts.toml
Normal file
|
@ -0,0 +1,38 @@
|
|||
logLevel = "DEBUG"
|
||||
defaultEntryPoints = ["http"]
|
||||
|
||||
[entryPoints]
|
||||
[entryPoints.http]
|
||||
address = ":8000"
|
||||
|
||||
[accessLog]
|
||||
format = "json"
|
||||
|
||||
[web]
|
||||
address = ":8080"
|
||||
|
||||
[forwardingTimeouts]
|
||||
dialTimeout = "300ms"
|
||||
responseHeaderTimeout = "300ms"
|
||||
|
||||
[file]
|
||||
|
||||
[backends]
|
||||
[backends.backend1]
|
||||
[backends.backend1.servers.server1]
|
||||
# Non-routable IP address that should always deliver a dial timeout.
|
||||
# See: https://stackoverflow.com/questions/100841/artificially-create-a-connection-timeout-error#answer-904609
|
||||
url = "http://10.255.255.1"
|
||||
[backends.backend2]
|
||||
[backends.backend2.servers.server2]
|
||||
url = "http://{{.TimeoutEndpoint}}:9000"
|
||||
|
||||
[frontends]
|
||||
[frontends.frontend1]
|
||||
backend = "backend1"
|
||||
[frontends.frontend1.routes.test_1]
|
||||
rule = "Path:/dialTimeout"
|
||||
[frontends.frontend2]
|
||||
backend = "backend2"
|
||||
[frontends.frontend2.routes.test_2]
|
||||
rule = "Path:/responseHeaderTimeout"
|
|
@ -25,6 +25,7 @@ func init() {
|
|||
check.Suite(&SimpleSuite{})
|
||||
check.Suite(&AccessLogSuite{})
|
||||
check.Suite(&HTTPSSuite{})
|
||||
check.Suite(&TimeoutSuite{})
|
||||
check.Suite(&FileSuite{})
|
||||
check.Suite(&HealthCheckSuite{})
|
||||
check.Suite(&DockerSuite{})
|
||||
|
|
7
integration/resources/compose/timeout.yml
Normal file
7
integration/resources/compose/timeout.yml
Normal file
|
@ -0,0 +1,7 @@
|
|||
timeoutEndpoint:
|
||||
image: yaman/timeout
|
||||
environment:
|
||||
- PROTO=http
|
||||
- PORT=9000
|
||||
ports:
|
||||
- "9000:9000"
|
44
integration/timeout_test.go
Normal file
44
integration/timeout_test.go
Normal file
|
@ -0,0 +1,44 @@
|
|||
package integration
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/containous/traefik/integration/try"
|
||||
"github.com/go-check/check"
|
||||
checker "github.com/vdemeester/shakers"
|
||||
)
|
||||
|
||||
type TimeoutSuite struct{ BaseSuite }
|
||||
|
||||
func (s *TimeoutSuite) SetUpSuite(c *check.C) {
|
||||
s.createComposeProject(c, "timeout")
|
||||
s.composeProject.Start(c)
|
||||
}
|
||||
|
||||
func (s *TimeoutSuite) TestForwardingTimeouts(c *check.C) {
|
||||
httpTimeoutEndpoint := s.composeProject.Container(c, "timeoutEndpoint").NetworkSettings.IPAddress
|
||||
file := s.adaptFile(c, "fixtures/timeout/forwarding_timeouts.toml", struct {
|
||||
TimeoutEndpoint string
|
||||
}{httpTimeoutEndpoint})
|
||||
defer os.Remove(file)
|
||||
|
||||
cmd, _ := s.cmdTraefik(withConfigFile(file))
|
||||
err := cmd.Start()
|
||||
c.Assert(err, checker.IsNil)
|
||||
defer cmd.Process.Kill()
|
||||
|
||||
err = try.GetRequest("http://127.0.0.1:8080/api/providers", 60*time.Second, try.BodyContains("Path:/dialTimeout"))
|
||||
c.Assert(err, checker.IsNil)
|
||||
|
||||
// This simulates a DialTimeout when connecting to the backend server.
|
||||
response, err := http.Get("http://127.0.0.1:8000/dialTimeout")
|
||||
c.Assert(err, checker.IsNil)
|
||||
c.Assert(response.StatusCode, checker.Equals, http.StatusGatewayTimeout)
|
||||
|
||||
// This simulates a ResponseHeaderTimeout.
|
||||
response, err = http.Get("http://127.0.0.1:8000/responseHeaderTimeout?sleep=1000")
|
||||
c.Assert(err, checker.IsNil)
|
||||
c.Assert(response.StatusCode, checker.Equals, http.StatusGatewayTimeout)
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue